diff --git a/ui/apps/console/openapi-ts.config.ts b/ui/apps/console/openapi-ts.config.ts
index 8a3557e06de..6cad7d0c68b 100644
--- a/ui/apps/console/openapi-ts.config.ts
+++ b/ui/apps/console/openapi-ts.config.ts
@@ -6,7 +6,9 @@ if (!input) {
   // generating from its URL produces a client missing the other editions'
   // schemas. Use `npm run generate -w @shellhub/console`, which bundles the
   // combined spec before invoking openapi-ts.
-  throw new Error("OPENAPI_SPEC_PATH is not set; run `npm run generate -w @shellhub/console`.");
+  throw new Error(
+    "OPENAPI_SPEC_PATH is not set; run `npm run generate -w @shellhub/console`.",
+  );
 }
 
 export default defineConfig({
@@ -23,6 +25,7 @@ export default defineConfig({
       name: "@tanstack/react-query",
       queryOptions: true,
       mutationOptions: true,
+      includeInEntry: true,
     },
   ],
 });
diff --git a/ui/apps/console/src/components/ConnectDrawer.tsx b/ui/apps/console/src/components/ConnectDrawer.tsx
index 89427e49b01..e14da4a14d5 100644
--- a/ui/apps/console/src/components/ConnectDrawer.tsx
+++ b/ui/apps/console/src/components/ConnectDrawer.tsx
@@ -25,7 +25,7 @@ import {
 import { BROWSER_KEY_QUERY_KEY } from "@/hooks/useBrowserKey";
 import { isRecordingSupported } from "../utils/recordings";
 import { isAlreadyEnrolled } from "../utils/sshIdentity";
-import { listSshIdentitiesOptions } from "../client/@tanstack/react-query.gen";
+import { listSshIdentitiesOptions } from "../client";
 import BrowserEnrollDialog from "./terminal/BrowserEnrollDialog";
 import CopyButton from "./common/CopyButton";
 import Drawer from "./common/Drawer";
diff --git a/ui/apps/console/src/components/billing/BillingSection.tsx b/ui/apps/console/src/components/billing/BillingSection.tsx
index 77edc5cc901..840f69f1816 100644
--- a/ui/apps/console/src/components/billing/BillingSection.tsx
+++ b/ui/apps/console/src/components/billing/BillingSection.tsx
@@ -14,7 +14,7 @@ import { useNamespace } from "@/hooks/useNamespaces";
 import { useOpenBillingPortal, useSubscription } from "@/hooks/useBilling";
 import { useInvalidateByIds } from "@/hooks/useInvalidateQueries";
 import { formatExpiry } from "@/utils/date";
-import type { BillingStatus } from "@/client/types.gen";
+import type { BillingStatus } from "@/client";
 import { cn } from "@shellhub/design-system/cn";
 import { Button } from "@shellhub/design-system/primitives";
 
@@ -157,7 +157,10 @@ function SectionRow({
 function StatusBadge({ status }: { status: BillingStatus }) {
   return (
     <span
-      className={cn("inline-flex items-center px-2.5 py-1 text-2xs font-mono font-semibold rounded border", STATUS_CHIP[status])}
+      className={cn(
+        "inline-flex items-center px-2.5 py-1 text-2xs font-mono font-semibold rounded border",
+        STATUS_CHIP[status],
+      )}
     >
       {STATUS_LABEL[status]}
     </span>
@@ -277,7 +280,10 @@ export default function BillingSection({ sectionId }: BillingSectionProps) {
           <div
             role="status"
             aria-live="polite"
-            className={cn("flex items-start gap-3 px-5 py-3 border-b", BANNER_CLASSES[banner.tone])}
+            className={cn(
+              "flex items-start gap-3 px-5 py-3 border-b",
+              BANNER_CLASSES[banner.tone],
+            )}
           >
             <banner.Icon
               aria-hidden="true"
diff --git a/ui/apps/console/src/components/common/__tests__/DeviceLimitBanner.test.tsx b/ui/apps/console/src/components/common/__tests__/DeviceLimitBanner.test.tsx
index a428ed86b63..ebfc739e942 100644
--- a/ui/apps/console/src/components/common/__tests__/DeviceLimitBanner.test.tsx
+++ b/ui/apps/console/src/components/common/__tests__/DeviceLimitBanner.test.tsx
@@ -1,7 +1,7 @@
 import { describe, it, expect, vi, beforeEach } from "vitest";
 import { render, screen, waitFor } from "@testing-library/react";
 import { createTestWrapper } from "@/tests/wrapper";
-import type { GetLicenseResponse } from "@/client/types.gen";
+import type { GetLicenseResponse } from "@/client";
 import { defaultConfig } from "@/env";
 import { useAuthStore } from "@/stores/authStore";
 
@@ -16,9 +16,6 @@ vi.mock("@/hooks/useAdminStats", () => ({
 }));
 vi.mock("@/client", () => ({
   getLicense: vi.fn(),
-}));
-
-vi.mock("@/client/@tanstack/react-query.gen", () => ({
   getLicenseQueryKey: vi.fn(() => ["getLicense"]),
 }));
 
diff --git a/ui/apps/console/src/components/common/__tests__/LicenseBanner.test.tsx b/ui/apps/console/src/components/common/__tests__/LicenseBanner.test.tsx
index 2aca5848120..e67e5bf7ba6 100644
--- a/ui/apps/console/src/components/common/__tests__/LicenseBanner.test.tsx
+++ b/ui/apps/console/src/components/common/__tests__/LicenseBanner.test.tsx
@@ -1,7 +1,7 @@
 import { describe, it, expect, vi, beforeEach } from "vitest";
 import { render, screen, waitFor } from "@testing-library/react";
 import { createTestWrapper } from "@/tests/wrapper";
-import type { GetLicenseResponse } from "@/client/types.gen";
+import type { GetLicenseResponse } from "@/client";
 import { defaultConfig } from "@/env";
 import { useAuthStore } from "@/stores/authStore";
 
@@ -12,9 +12,6 @@ vi.mock("@/hooks/useAdminLicense", () => ({
 }));
 vi.mock("@/client", () => ({
   getLicense: vi.fn(),
-}));
-
-vi.mock("@/client/@tanstack/react-query.gen", () => ({
   getLicenseQueryKey: vi.fn(() => ["getLicense"]),
 }));
 
diff --git a/ui/apps/console/src/components/common/__tests__/LicenseGuard.test.tsx b/ui/apps/console/src/components/common/__tests__/LicenseGuard.test.tsx
index 2aab0466f78..6c3928ff29b 100644
--- a/ui/apps/console/src/components/common/__tests__/LicenseGuard.test.tsx
+++ b/ui/apps/console/src/components/common/__tests__/LicenseGuard.test.tsx
@@ -5,7 +5,7 @@ import React from "react";
 import { createTestWrapper } from "@/tests/wrapper";
 import { defaultConfig } from "@/env";
 import { useAuthStore } from "@/stores/authStore";
-import type { GetLicenseResponse } from "@/client/types.gen";
+import type { GetLicenseResponse } from "@/client";
 
 // ── Dependency mocks ──────────────────────────────────────────────────────────
 
@@ -14,9 +14,6 @@ vi.mock("@/hooks/useAdminLicense", () => ({
 }));
 vi.mock("@/client", () => ({
   getLicense: vi.fn(),
-}));
-
-vi.mock("@/client/@tanstack/react-query.gen", () => ({
   getLicenseQueryKey: vi.fn(() => ["getLicense"]),
 }));
 
diff --git a/ui/apps/console/src/hooks/__tests__/useAdminFirewallRules.test.ts b/ui/apps/console/src/hooks/__tests__/useAdminFirewallRules.test.ts
index 00bc875b303..439276b44bd 100644
--- a/ui/apps/console/src/hooks/__tests__/useAdminFirewallRules.test.ts
+++ b/ui/apps/console/src/hooks/__tests__/useAdminFirewallRules.test.ts
@@ -11,9 +11,6 @@ import { renderHookWithClient } from "@/tests/wrapper";
 vi.mock("@/client", () => ({
   getFirewallRulesAdmin: vi.fn(),
   getFirewallRuleAdmin: vi.fn(),
-}));
-
-vi.mock("@/client/@tanstack/react-query.gen", () => ({
   getFirewallRulesAdminQueryKey: vi.fn((opts: unknown) => [
     { _id: "getFirewallRulesAdmin" },
     opts,
diff --git a/ui/apps/console/src/hooks/__tests__/useAdminLicense.test.ts b/ui/apps/console/src/hooks/__tests__/useAdminLicense.test.ts
index f42113ffdc1..6f68be1de3e 100644
--- a/ui/apps/console/src/hooks/__tests__/useAdminLicense.test.ts
+++ b/ui/apps/console/src/hooks/__tests__/useAdminLicense.test.ts
@@ -7,9 +7,6 @@ import { useAuthStore } from "@/stores/authStore";
 // ── Dependency mocks ──────────────────────────────────────────────────────────
 vi.mock("@/client", () => ({
   getLicense: vi.fn(),
-}));
-
-vi.mock("@/client/@tanstack/react-query.gen", () => ({
   getLicenseQueryKey: vi.fn(() => ["getLicense"]),
 }));
 
diff --git a/ui/apps/console/src/hooks/__tests__/useAdminSessions.test.ts b/ui/apps/console/src/hooks/__tests__/useAdminSessions.test.ts
index b4db6e5d6bd..9dd01a97ffd 100644
--- a/ui/apps/console/src/hooks/__tests__/useAdminSessions.test.ts
+++ b/ui/apps/console/src/hooks/__tests__/useAdminSessions.test.ts
@@ -10,12 +10,9 @@ vi.mock("@/api/pagination", () => ({
   paginatedQueryFn: vi.fn(),
 }));
 
-vi.mock("@/client/@tanstack/react-query.gen", () => ({
-  getSessionsAdminQueryKey: vi.fn(() => ["sessions-admin"]),
-}));
-
 vi.mock("@/client", () => ({
   getSessionsAdmin: vi.fn(),
+  getSessionsAdminQueryKey: vi.fn(() => ["sessions-admin"]),
 }));
 
 import { useAuthStore } from "@/stores/authStore";
diff --git a/ui/apps/console/src/hooks/__tests__/useAdminUserMutations.test.ts b/ui/apps/console/src/hooks/__tests__/useAdminUserMutations.test.ts
index 5dfdd368a6a..1544ea42e4e 100644
--- a/ui/apps/console/src/hooks/__tests__/useAdminUserMutations.test.ts
+++ b/ui/apps/console/src/hooks/__tests__/useAdminUserMutations.test.ts
@@ -14,7 +14,7 @@ const mockDeleteFn = vi.fn();
 const mockResetPasswordFn = vi.fn();
 const mockInvalidate = vi.fn();
 
-vi.mock("@/client/@tanstack/react-query.gen", () => ({
+vi.mock("@/client", () => ({
   createUserAdminMutation: vi.fn(() => ({ mutationFn: mockCreateFn })),
   adminUpdateUserMutation: vi.fn(() => ({ mutationFn: mockUpdateFn })),
   adminDeleteUserMutation: vi.fn(() => ({ mutationFn: mockDeleteFn })),
diff --git a/ui/apps/console/src/hooks/__tests__/useAdminUsers.test.ts b/ui/apps/console/src/hooks/__tests__/useAdminUsers.test.ts
index 733e26e8fab..562d210b640 100644
--- a/ui/apps/console/src/hooks/__tests__/useAdminUsers.test.ts
+++ b/ui/apps/console/src/hooks/__tests__/useAdminUsers.test.ts
@@ -9,9 +9,6 @@ import { useAuthStore } from "@/stores/authStore";
 vi.mock("@/client", () => ({
   getUsers: vi.fn(),
   getUser: vi.fn(),
-}));
-
-vi.mock("@/client/@tanstack/react-query.gen", () => ({
   getUsersQueryKey: vi.fn((opts: unknown) => [{ _id: "getUsers" }, opts]),
   getUserOptions: vi.fn((opts: unknown) => ({
     queryKey: [{ _id: "getUser" }, opts],
diff --git a/ui/apps/console/src/hooks/__tests__/useBilling.test.ts b/ui/apps/console/src/hooks/__tests__/useBilling.test.ts
index 655302252a4..1e552b11cae 100644
--- a/ui/apps/console/src/hooks/__tests__/useBilling.test.ts
+++ b/ui/apps/console/src/hooks/__tests__/useBilling.test.ts
@@ -12,7 +12,7 @@ const mockGetSubscriptionFn = vi.fn();
 const mockInvalidate = vi.fn();
 const mockCreateBillingPortalSession = vi.fn();
 
-vi.mock("@/client/@tanstack/react-query.gen", () => ({
+vi.mock("@/client", () => ({
   getCustomerOptions: vi.fn(() => ({
     queryKey: [{ _id: "getCustomer" }],
     queryFn: mockGetCustomerFn,
@@ -30,16 +30,13 @@ vi.mock("@/client/@tanstack/react-query.gen", () => ({
   setDefaultPaymentMethodMutation: vi.fn(() => ({
     mutationFn: mockSetDefault,
   })),
+  createBillingPortalSession: (): unknown => mockCreateBillingPortalSession(),
 }));
 
 vi.mock("../useInvalidateQueries", () => ({
   useInvalidateByIds: vi.fn(() => mockInvalidate),
 }));
 
-vi.mock("@/client", () => ({
-  createBillingPortalSession: (): unknown => mockCreateBillingPortalSession(),
-}));
-
 async function importHooks() {
   return await import("../useBilling");
 }
diff --git a/ui/apps/console/src/hooks/__tests__/useDeviceChooser.test.ts b/ui/apps/console/src/hooks/__tests__/useDeviceChooser.test.ts
index 8601b89b9db..a487b93a4a6 100644
--- a/ui/apps/console/src/hooks/__tests__/useDeviceChooser.test.ts
+++ b/ui/apps/console/src/hooks/__tests__/useDeviceChooser.test.ts
@@ -8,7 +8,7 @@ const mockMostUsedQueryFn = vi.fn();
 const mockChoiceMutationFn = vi.fn();
 const mockInvalidate = vi.fn();
 
-vi.mock("@/client/@tanstack/react-query.gen", () => ({
+vi.mock("@/client", () => ({
   getDevicesMostUsedOptions: vi.fn(() => ({
     queryKey: [{ _id: "getDevicesMostUsed" }],
     queryFn: mockMostUsedQueryFn,
diff --git a/ui/apps/console/src/hooks/__tests__/useInvitationMutations.test.ts b/ui/apps/console/src/hooks/__tests__/useInvitationMutations.test.ts
index 23694955e0b..81d9bafabdf 100644
--- a/ui/apps/console/src/hooks/__tests__/useInvitationMutations.test.ts
+++ b/ui/apps/console/src/hooks/__tests__/useInvitationMutations.test.ts
@@ -12,7 +12,7 @@ const mockGenerateLinkFn = vi.fn();
 const mockCancelFn = vi.fn();
 const mockInvalidate = vi.fn();
 
-vi.mock("@/client/@tanstack/react-query.gen", () => ({
+vi.mock("@/client", () => ({
   acceptInviteMutation: vi.fn(() => ({ mutationFn: mockAcceptFn })),
   generateInvitationLinkMutation: vi.fn(() => ({
     mutationFn: mockGenerateLinkFn,
diff --git a/ui/apps/console/src/hooks/__tests__/useInvitations.test.ts b/ui/apps/console/src/hooks/__tests__/useInvitations.test.ts
index 5c524033759..2bc1c24c720 100644
--- a/ui/apps/console/src/hooks/__tests__/useInvitations.test.ts
+++ b/ui/apps/console/src/hooks/__tests__/useInvitations.test.ts
@@ -7,14 +7,11 @@ import {
 } from "../useInvitations";
 import type { MembershipInvitation } from "@/client";
 
+const mockResolveFn = vi.fn();
+
 vi.mock("@/client", () => ({
   getMembershipInvitationList: vi.fn(),
   getNamespaceMembershipInvitationList: vi.fn(),
-}));
-
-const mockResolveFn = vi.fn();
-
-vi.mock("@/client/@tanstack/react-query.gen", () => ({
   getMembershipInvitationListQueryKey: vi.fn((opts: unknown) => [
     { _id: "getMembershipInvitationList" },
     opts,
@@ -66,8 +63,8 @@ describe("useNamespaceInvitations", () => {
       const inv = makeInvitation({ status: "pending" });
       mockFetchFn.mockResolvedValue({ data: [inv], totalCount: 1 });
 
-      const { result } = renderHookWithClient(
-        () => useNamespaceInvitations({ tenantId: "t1" }),
+      const { result } = renderHookWithClient(() =>
+        useNamespaceInvitations({ tenantId: "t1" }),
       );
 
       await waitFor(() => expect(result.current.isLoading).toBe(false));
@@ -77,8 +74,8 @@ describe("useNamespaceInvitations", () => {
     it("returns totalCount from the paginated result", async () => {
       mockFetchFn.mockResolvedValue({ data: [], totalCount: 7 });
 
-      const { result } = renderHookWithClient(
-        () => useNamespaceInvitations({ tenantId: "t1" }),
+      const { result } = renderHookWithClient(() =>
+        useNamespaceInvitations({ tenantId: "t1" }),
       );
 
       await waitFor(() => expect(result.current.isLoading).toBe(false));
@@ -88,8 +85,8 @@ describe("useNamespaceInvitations", () => {
     it("defaults invitations to empty array while loading", () => {
       mockFetchFn.mockReturnValue(new Promise(() => {}));
 
-      const { result } = renderHookWithClient(
-        () => useNamespaceInvitations({ tenantId: "t1" }),
+      const { result } = renderHookWithClient(() =>
+        useNamespaceInvitations({ tenantId: "t1" }),
       );
 
       expect(result.current.invitations).toEqual([]);
@@ -99,8 +96,8 @@ describe("useNamespaceInvitations", () => {
       const err = new Error("fetch failed");
       mockFetchFn.mockRejectedValue(err);
 
-      const { result } = renderHookWithClient(
-        () => useNamespaceInvitations({ tenantId: "t1" }),
+      const { result } = renderHookWithClient(() =>
+        useNamespaceInvitations({ tenantId: "t1" }),
       );
 
       await waitFor(() => expect(result.current.error).toBeTruthy());
@@ -112,8 +109,8 @@ describe("useNamespaceInvitations", () => {
     it("does not fetch when enabled is false", () => {
       mockFetchFn.mockResolvedValue({ data: [], totalCount: 0 });
 
-      renderHookWithClient(
-        () => useNamespaceInvitations({ tenantId: "t1", enabled: false }),
+      renderHookWithClient(() =>
+        useNamespaceInvitations({ tenantId: "t1", enabled: false }),
       );
 
       expect(mockFetchFn).not.toHaveBeenCalled();
diff --git a/ui/apps/console/src/hooks/__tests__/useLatestAnnouncement.test.ts b/ui/apps/console/src/hooks/__tests__/useLatestAnnouncement.test.ts
index 8c37c7b35a9..0f09abea89b 100644
--- a/ui/apps/console/src/hooks/__tests__/useLatestAnnouncement.test.ts
+++ b/ui/apps/console/src/hooks/__tests__/useLatestAnnouncement.test.ts
@@ -5,16 +5,13 @@ import { useLatestAnnouncement } from "../useLatestAnnouncement";
 import type { Announcement } from "@/client";
 
 // Mock the generated query-option factories so we control what queryFn runs
-vi.mock("@/client/@tanstack/react-query.gen", () => ({
+vi.mock("@/client", () => ({
   listAnnouncementsOptions: vi.fn(),
   getAnnouncementOptions: vi.fn(),
 }));
 
 import { getConfig, defaultConfig } from "@/env";
-import {
-  listAnnouncementsOptions,
-  getAnnouncementOptions,
-} from "@/client/@tanstack/react-query.gen";
+import { listAnnouncementsOptions, getAnnouncementOptions } from "@/client";
 
 const mockGetConfig = vi.mocked(getConfig);
 const mockListAnnouncementsOptions = vi.mocked(listAnnouncementsOptions);
diff --git a/ui/apps/console/src/hooks/__tests__/usePublicKeys.test.ts b/ui/apps/console/src/hooks/__tests__/usePublicKeys.test.ts
index 12c230d0965..6d2f4dd170f 100644
--- a/ui/apps/console/src/hooks/__tests__/usePublicKeys.test.ts
+++ b/ui/apps/console/src/hooks/__tests__/usePublicKeys.test.ts
@@ -6,9 +6,6 @@ import type { PublicKeyResponse } from "@/client";
 
 vi.mock("@/client", () => ({
   getPublicKeys: vi.fn(),
-}));
-
-vi.mock("@/client/@tanstack/react-query.gen", () => ({
   getPublicKeysQueryKey: vi.fn((opts: unknown) => [
     { _id: "getPublicKeys" },
     opts,
diff --git a/ui/apps/console/src/hooks/__tests__/useSupportIdentifier.test.ts b/ui/apps/console/src/hooks/__tests__/useSupportIdentifier.test.ts
index a8dd1d613a1..ddccece25cb 100644
--- a/ui/apps/console/src/hooks/__tests__/useSupportIdentifier.test.ts
+++ b/ui/apps/console/src/hooks/__tests__/useSupportIdentifier.test.ts
@@ -4,7 +4,7 @@ import { renderHookWithClient } from "@/tests/wrapper";
 
 const mockGetNamespaceSupportFn = vi.fn();
 
-vi.mock("@/client/@tanstack/react-query.gen", () => ({
+vi.mock("@/client", () => ({
   getNamespaceSupportOptions: vi.fn(() => ({
     queryKey: [{ _id: "getNamespaceSupport" }],
     queryFn: mockGetNamespaceSupportFn,
@@ -69,8 +69,8 @@ describe("useSupportIdentifier", () => {
       mockGetNamespaceSupportFn.mockResolvedValue({ identifier: "abc123" });
       const { useSupportIdentifier } = await importHook();
 
-      const { result } = renderHookWithClient(
-        () => useSupportIdentifier("tenant-123", true),
+      const { result } = renderHookWithClient(() =>
+        useSupportIdentifier("tenant-123", true),
       );
 
       await waitFor(() => expect(result.current.identifier).toBe("abc123"));
@@ -84,8 +84,8 @@ describe("useSupportIdentifier", () => {
       mockGetNamespaceSupportFn.mockRejectedValue(new Error("network error"));
       const { useSupportIdentifier } = await importHook();
 
-      const { result } = renderHookWithClient(
-        () => useSupportIdentifier("tenant-123", true),
+      const { result } = renderHookWithClient(() =>
+        useSupportIdentifier("tenant-123", true),
       );
 
       await waitFor(() => expect(result.current.isError).toBe(true));
diff --git a/ui/apps/console/src/hooks/__tests__/useUploadLicense.test.ts b/ui/apps/console/src/hooks/__tests__/useUploadLicense.test.ts
index a668b4c05d0..9b09b036e1d 100644
--- a/ui/apps/console/src/hooks/__tests__/useUploadLicense.test.ts
+++ b/ui/apps/console/src/hooks/__tests__/useUploadLicense.test.ts
@@ -6,7 +6,7 @@ import { useUploadLicense } from "../useUploadLicense";
 const mockMutationFn = vi.fn();
 const mockInvalidate = vi.fn();
 
-vi.mock("@/client/@tanstack/react-query.gen", () => ({
+vi.mock("@/client", () => ({
   sendLicenseMutation: vi.fn(() => ({ mutationFn: mockMutationFn })),
 }));
 
diff --git a/ui/apps/console/src/hooks/useAccessPolicies.ts b/ui/apps/console/src/hooks/useAccessPolicies.ts
index 256785efd3e..1d34ec86562 100644
--- a/ui/apps/console/src/hooks/useAccessPolicies.ts
+++ b/ui/apps/console/src/hooks/useAccessPolicies.ts
@@ -1,7 +1,6 @@
 import { useMemo } from "react";
 import { useQuery } from "@tanstack/react-query";
-import { listAccessPoliciesOptions } from "../client/@tanstack/react-query.gen";
-import type { AccessPolicy } from "../client";
+import { listAccessPoliciesOptions, type AccessPolicy } from "../client";
 
 export function useAccessPolicies() {
   const result = useQuery(listAccessPoliciesOptions());
diff --git a/ui/apps/console/src/hooks/useAccessPolicyMutations.ts b/ui/apps/console/src/hooks/useAccessPolicyMutations.ts
index 0548637e7bf..6aa2f383d34 100644
--- a/ui/apps/console/src/hooks/useAccessPolicyMutations.ts
+++ b/ui/apps/console/src/hooks/useAccessPolicyMutations.ts
@@ -3,7 +3,7 @@ import {
   createAccessPolicyMutation,
   updateAccessPolicyMutation,
   deleteAccessPolicyMutation,
-} from "../client/@tanstack/react-query.gen";
+} from "../client";
 import { useInvalidateByIds } from "./useInvalidateQueries";
 
 export function useCreateAccessPolicy() {
diff --git a/ui/apps/console/src/hooks/useAdminAccountRequestMutations.ts b/ui/apps/console/src/hooks/useAdminAccountRequestMutations.ts
index e3f060b8a37..a9337f55d99 100644
--- a/ui/apps/console/src/hooks/useAdminAccountRequestMutations.ts
+++ b/ui/apps/console/src/hooks/useAdminAccountRequestMutations.ts
@@ -1,8 +1,5 @@
 import { useMutation } from "@tanstack/react-query";
-import {
-  approveUserMutation,
-  adminDeleteUserMutation,
-} from "../client/@tanstack/react-query.gen";
+import { approveUserMutation, adminDeleteUserMutation } from "../client";
 import { useInvalidateByIds } from "./useInvalidateQueries";
 
 // Approving clears the awaiting_approval flag; the account stays not-confirmed until the
diff --git a/ui/apps/console/src/hooks/useAdminAccountRequests.ts b/ui/apps/console/src/hooks/useAdminAccountRequests.ts
index 7f7a23d22c6..5925a9bda85 100644
--- a/ui/apps/console/src/hooks/useAdminAccountRequests.ts
+++ b/ui/apps/console/src/hooks/useAdminAccountRequests.ts
@@ -1,10 +1,10 @@
 import { useQuery } from "@tanstack/react-query";
 import {
   getUsers as getUsersSdk,
+  getUsersQueryKey,
   type GetUsersData,
   type UserAdminResponse,
 } from "../client";
-import { getUsersQueryKey } from "../client/@tanstack/react-query.gen";
 import { paginatedQueryFn, type PaginatedResult } from "../api/pagination";
 import { useAuthStore } from "../stores/authStore";
 import { isSdkError } from "../api/errors";
diff --git a/ui/apps/console/src/hooks/useAdminAnnouncementMutations.ts b/ui/apps/console/src/hooks/useAdminAnnouncementMutations.ts
index eeead09fe4e..c6b1a176545 100644
--- a/ui/apps/console/src/hooks/useAdminAnnouncementMutations.ts
+++ b/ui/apps/console/src/hooks/useAdminAnnouncementMutations.ts
@@ -3,7 +3,7 @@ import {
   createAnnouncementMutation,
   updateAnnouncementMutation,
   deleteAnnouncementMutation,
-} from "../client/@tanstack/react-query.gen";
+} from "../client";
 import { useInvalidateByIds } from "./useInvalidateQueries";
 
 export function useAdminCreateAnnouncement() {
diff --git a/ui/apps/console/src/hooks/useAdminAnnouncements.ts b/ui/apps/console/src/hooks/useAdminAnnouncements.ts
index bffb516d445..3dd17d99629 100644
--- a/ui/apps/console/src/hooks/useAdminAnnouncements.ts
+++ b/ui/apps/console/src/hooks/useAdminAnnouncements.ts
@@ -1,13 +1,11 @@
 import { useQuery } from "@tanstack/react-query";
 import {
   listAnnouncementsAdmin as listAnnouncementsAdminSdk,
+  listAnnouncementsAdminQueryKey,
+  getAnnouncementAdminOptions,
   type ListAnnouncementsAdminData,
   type AnnouncementShort,
 } from "../client";
-import {
-  listAnnouncementsAdminQueryKey,
-  getAnnouncementAdminOptions,
-} from "../client/@tanstack/react-query.gen";
 import { paginatedQueryFn, type PaginatedResult } from "../api/pagination";
 import { useAuthStore } from "../stores/authStore";
 import { isSdkError } from "../api/errors";
diff --git a/ui/apps/console/src/hooks/useAdminDevices.ts b/ui/apps/console/src/hooks/useAdminDevices.ts
index c1a826664d2..8dd5c112cbf 100644
--- a/ui/apps/console/src/hooks/useAdminDevices.ts
+++ b/ui/apps/console/src/hooks/useAdminDevices.ts
@@ -2,14 +2,12 @@ import { useMemo } from "react";
 import { useQuery } from "@tanstack/react-query";
 import {
   getDevicesAdmin,
+  getDevicesAdminQueryKey,
+  getDeviceAdminOptions,
   type GetDevicesAdminData,
   type Device,
   type DeviceStatus,
 } from "../client";
-import {
-  getDevicesAdminQueryKey,
-  getDeviceAdminOptions,
-} from "../client/@tanstack/react-query.gen";
 import { paginatedQueryFn, type PaginatedResult } from "../api/pagination";
 import { useAuthStore } from "../stores/authStore";
 import { isSdkError } from "../api/errors";
diff --git a/ui/apps/console/src/hooks/useAdminFirewallRules.ts b/ui/apps/console/src/hooks/useAdminFirewallRules.ts
index 8c71722c6e8..90bb11f02b8 100644
--- a/ui/apps/console/src/hooks/useAdminFirewallRules.ts
+++ b/ui/apps/console/src/hooks/useAdminFirewallRules.ts
@@ -2,13 +2,11 @@ import { useMemo } from "react";
 import { useQuery } from "@tanstack/react-query";
 import {
   getFirewallRulesAdmin,
+  getFirewallRulesAdminQueryKey,
+  getFirewallRuleAdminOptions,
   type GetFirewallRulesAdminData,
   type FirewallRulesResponse,
 } from "../client";
-import {
-  getFirewallRulesAdminQueryKey,
-  getFirewallRuleAdminOptions,
-} from "../client/@tanstack/react-query.gen";
 import { paginatedQueryFn, type PaginatedResult } from "../api/pagination";
 import { useAuthStore } from "../stores/authStore";
 import { isSdkError } from "../api/errors";
diff --git a/ui/apps/console/src/hooks/useAdminLicense.ts b/ui/apps/console/src/hooks/useAdminLicense.ts
index 2d3b43818c6..b95e1578c4d 100644
--- a/ui/apps/console/src/hooks/useAdminLicense.ts
+++ b/ui/apps/console/src/hooks/useAdminLicense.ts
@@ -1,10 +1,12 @@
 import { useQuery } from "@tanstack/react-query";
-import { getLicenseQueryKey } from "../client/@tanstack/react-query.gen";
-import { getLicense } from "../client";
+import {
+  getLicense,
+  getLicenseQueryKey,
+  type GetLicenseResponse,
+} from "../client";
 import { useAuthStore } from "../stores/authStore";
 import { isSdkError } from "../api/errors";
 import { isCloud } from "../env";
-import type { GetLicenseResponse } from "../client/types.gen";
 
 export { getLicenseQueryKey };
 
diff --git a/ui/apps/console/src/hooks/useAdminNamespaceMutations.ts b/ui/apps/console/src/hooks/useAdminNamespaceMutations.ts
index f8b4d84ebca..4eb6fd1633e 100644
--- a/ui/apps/console/src/hooks/useAdminNamespaceMutations.ts
+++ b/ui/apps/console/src/hooks/useAdminNamespaceMutations.ts
@@ -2,7 +2,7 @@ import { useMutation } from "@tanstack/react-query";
 import {
   editNamespaceAdminMutation,
   deleteNamespaceAdminMutation,
-} from "../client/@tanstack/react-query.gen";
+} from "../client";
 import { useInvalidateByIds } from "./useInvalidateQueries";
 
 export function useAdminEditNamespace() {
diff --git a/ui/apps/console/src/hooks/useAdminNamespaces.ts b/ui/apps/console/src/hooks/useAdminNamespaces.ts
index a2473de37cc..ab538e3e049 100644
--- a/ui/apps/console/src/hooks/useAdminNamespaces.ts
+++ b/ui/apps/console/src/hooks/useAdminNamespaces.ts
@@ -1,13 +1,11 @@
 import { useQuery } from "@tanstack/react-query";
 import {
   getNamespacesAdmin as getNamespacesAdminSdk,
+  getNamespacesAdminQueryKey,
+  getNamespaceAdminOptions,
   type GetNamespacesAdminData,
   type Namespace,
 } from "../client";
-import {
-  getNamespacesAdminQueryKey,
-  getNamespaceAdminOptions,
-} from "../client/@tanstack/react-query.gen";
 import { paginatedQueryFn, type PaginatedResult } from "../api/pagination";
 import { useAuthStore } from "../stores/authStore";
 import { isSdkError } from "../api/errors";
diff --git a/ui/apps/console/src/hooks/useAdminSessionDetail.ts b/ui/apps/console/src/hooks/useAdminSessionDetail.ts
index 0c12ddbb9d4..223ee518a89 100644
--- a/ui/apps/console/src/hooks/useAdminSessionDetail.ts
+++ b/ui/apps/console/src/hooks/useAdminSessionDetail.ts
@@ -1,5 +1,5 @@
 import { useQuery } from "@tanstack/react-query";
-import { getSessionAdminOptions } from "../client/@tanstack/react-query.gen";
+import { getSessionAdminOptions } from "../client";
 import { useAuthStore } from "../stores/authStore";
 import { isSdkError } from "../api/errors";
 
diff --git a/ui/apps/console/src/hooks/useAdminSessions.ts b/ui/apps/console/src/hooks/useAdminSessions.ts
index e0261da6e0a..6618844da28 100644
--- a/ui/apps/console/src/hooks/useAdminSessions.ts
+++ b/ui/apps/console/src/hooks/useAdminSessions.ts
@@ -1,10 +1,10 @@
 import { useQuery } from "@tanstack/react-query";
 import {
   getSessionsAdmin,
+  getSessionsAdminQueryKey,
   type GetSessionsAdminData,
   type Session,
 } from "@/client";
-import { getSessionsAdminQueryKey } from "@/client/@tanstack/react-query.gen";
 import { paginatedQueryFn, type PaginatedResult } from "@/api/pagination";
 import { useAuthStore } from "@/stores/authStore";
 import { isSdkError } from "@/api/errors";
diff --git a/ui/apps/console/src/hooks/useAdminStats.ts b/ui/apps/console/src/hooks/useAdminStats.ts
index 4cb87393ee2..7ee6664b51b 100644
--- a/ui/apps/console/src/hooks/useAdminStats.ts
+++ b/ui/apps/console/src/hooks/useAdminStats.ts
@@ -1,8 +1,5 @@
 import { useQuery } from "@tanstack/react-query";
-import {
-  getStatsOptions,
-  getStatsQueryKey,
-} from "../client/@tanstack/react-query.gen";
+import { getStatsOptions, getStatsQueryKey } from "../client";
 import { useAuthStore } from "../stores/authStore";
 import { isSdkError } from "../api/errors";
 
diff --git a/ui/apps/console/src/hooks/useAdminUserMutations.ts b/ui/apps/console/src/hooks/useAdminUserMutations.ts
index 96fa20cb670..c3527f2156a 100644
--- a/ui/apps/console/src/hooks/useAdminUserMutations.ts
+++ b/ui/apps/console/src/hooks/useAdminUserMutations.ts
@@ -4,7 +4,7 @@ import {
   adminUpdateUserMutation,
   adminDeleteUserMutation,
   adminResetUserPasswordMutation,
-} from "../client/@tanstack/react-query.gen";
+} from "../client";
 import { useInvalidateByIds } from "./useInvalidateQueries";
 
 export function useCreateUser() {
diff --git a/ui/apps/console/src/hooks/useAdminUsers.ts b/ui/apps/console/src/hooks/useAdminUsers.ts
index 1c094537718..677c288fec5 100644
--- a/ui/apps/console/src/hooks/useAdminUsers.ts
+++ b/ui/apps/console/src/hooks/useAdminUsers.ts
@@ -1,13 +1,11 @@
 import { useQuery } from "@tanstack/react-query";
 import {
   getUsers as getUsersSdk,
+  getUsersQueryKey,
+  getUserOptions,
   type GetUsersData,
   type UserAdminResponse,
 } from "../client";
-import {
-  getUsersQueryKey,
-  getUserOptions,
-} from "../client/@tanstack/react-query.gen";
 import { paginatedQueryFn, type PaginatedResult } from "../api/pagination";
 import { useAuthStore } from "../stores/authStore";
 import { isSdkError } from "../api/errors";
diff --git a/ui/apps/console/src/hooks/useApiKeyMutations.ts b/ui/apps/console/src/hooks/useApiKeyMutations.ts
index 49fb699e7b8..ff0f2e2b91d 100644
--- a/ui/apps/console/src/hooks/useApiKeyMutations.ts
+++ b/ui/apps/console/src/hooks/useApiKeyMutations.ts
@@ -3,7 +3,7 @@ import {
   apiKeyCreateMutation,
   apiKeyUpdateMutation,
   apiKeyDeleteMutation,
-} from "../client/@tanstack/react-query.gen";
+} from "../client";
 import { useInvalidateByIds } from "./useInvalidateQueries";
 
 export function useCreateApiKey() {
diff --git a/ui/apps/console/src/hooks/useApiKeys.ts b/ui/apps/console/src/hooks/useApiKeys.ts
index 07bcd6afd29..fed1cdf8cae 100644
--- a/ui/apps/console/src/hooks/useApiKeys.ts
+++ b/ui/apps/console/src/hooks/useApiKeys.ts
@@ -1,10 +1,10 @@
 import { useQuery } from "@tanstack/react-query";
 import {
   apiKeyList,
+  apiKeyListQueryKey,
   type ApiKeyListData,
   type ApiKey,
 } from "../client";
-import { apiKeyListQueryKey } from "../client/@tanstack/react-query.gen";
 import { paginatedQueryFn, type PaginatedResult } from "../api/pagination";
 
 interface UseApiKeysParams {
diff --git a/ui/apps/console/src/hooks/useBilling.ts b/ui/apps/console/src/hooks/useBilling.ts
index e2439a6f20d..af91f606a76 100644
--- a/ui/apps/console/src/hooks/useBilling.ts
+++ b/ui/apps/console/src/hooks/useBilling.ts
@@ -7,8 +7,8 @@ import {
   attachPaymentMethodMutation,
   detachPaymentMethodMutation,
   setDefaultPaymentMethodMutation,
-} from "../client/@tanstack/react-query.gen";
-import { createBillingPortalSession } from "@/client";
+  createBillingPortalSession,
+} from "../client";
 import { useInvalidateByIds } from "./useInvalidateQueries";
 
 function useInvalidateBilling() {
diff --git a/ui/apps/console/src/hooks/useContainer.ts b/ui/apps/console/src/hooks/useContainer.ts
index 40408e0a0d5..c2e8e0aebdb 100644
--- a/ui/apps/console/src/hooks/useContainer.ts
+++ b/ui/apps/console/src/hooks/useContainer.ts
@@ -1,5 +1,5 @@
 import { useQuery } from "@tanstack/react-query";
-import { getContainerOptions } from "../client/@tanstack/react-query.gen";
+import { getContainerOptions } from "../client";
 
 export function useContainer(uid: string) {
   const result = useQuery({
diff --git a/ui/apps/console/src/hooks/useContainerMutations.ts b/ui/apps/console/src/hooks/useContainerMutations.ts
index 94316800113..976540eb8cd 100644
--- a/ui/apps/console/src/hooks/useContainerMutations.ts
+++ b/ui/apps/console/src/hooks/useContainerMutations.ts
@@ -4,8 +4,10 @@ import {
   deleteContainerMutation,
   updateContainerMutation,
   updateContainerStatusMutation,
-} from "../client/@tanstack/react-query.gen";
-import { createTag, pushTagToContainer, pullTagFromContainer } from "../client";
+  createTag,
+  pushTagToContainer,
+  pullTagFromContainer,
+} from "../client";
 import { useInvalidateByIds } from "./useInvalidateQueries";
 
 export function useUpdateContainerStatus() {
diff --git a/ui/apps/console/src/hooks/useContainers.ts b/ui/apps/console/src/hooks/useContainers.ts
index 982f77590cb..a1b2137b28d 100644
--- a/ui/apps/console/src/hooks/useContainers.ts
+++ b/ui/apps/console/src/hooks/useContainers.ts
@@ -2,10 +2,11 @@ import { useMemo } from "react";
 import { useQuery } from "@tanstack/react-query";
 import {
   getContainers as getContainersSdk,
+  getContainersQueryKey,
   type GetContainersData,
+  type Device,
+  type DeviceStatus,
 } from "../client";
-import type { Device, DeviceStatus } from "../client";
-import { getContainersQueryKey } from "../client/@tanstack/react-query.gen";
 import { paginatedQueryFn, type PaginatedResult } from "../api/pagination";
 import { toBase64Json } from "@/utils/encoding";
 import { normalizeDeviceTags } from "@/utils/deviceTags";
diff --git a/ui/apps/console/src/hooks/useDevice.ts b/ui/apps/console/src/hooks/useDevice.ts
index e6814f58c35..9d6d2f0924d 100644
--- a/ui/apps/console/src/hooks/useDevice.ts
+++ b/ui/apps/console/src/hooks/useDevice.ts
@@ -1,5 +1,5 @@
 import { useQuery } from "@tanstack/react-query";
-import { getDeviceOptions } from "../client/@tanstack/react-query.gen";
+import { getDeviceOptions } from "../client";
 
 export function useDevice(uid: string) {
   const result = useQuery({
diff --git a/ui/apps/console/src/hooks/useDeviceChooser.ts b/ui/apps/console/src/hooks/useDeviceChooser.ts
index 1c25fd94c2b..e48e1eb7016 100644
--- a/ui/apps/console/src/hooks/useDeviceChooser.ts
+++ b/ui/apps/console/src/hooks/useDeviceChooser.ts
@@ -2,7 +2,7 @@ import { useMutation, useQuery } from "@tanstack/react-query";
 import {
   choiceDevicesMutation,
   getDevicesMostUsedOptions,
-} from "../client/@tanstack/react-query.gen";
+} from "../client";
 import { useInvalidateByIds } from "./useInvalidateQueries";
 import { normalizeDeviceTags, type TaggedDevice } from "@/utils/deviceTags";
 
diff --git a/ui/apps/console/src/hooks/useDeviceCode.ts b/ui/apps/console/src/hooks/useDeviceCode.ts
index 04e6b2428aa..7e8180cf0b4 100644
--- a/ui/apps/console/src/hooks/useDeviceCode.ts
+++ b/ui/apps/console/src/hooks/useDeviceCode.ts
@@ -2,7 +2,7 @@ import { useQuery, useMutation } from "@tanstack/react-query";
 import {
   resolveDeviceLoginCodeOptions,
   acceptDevicePairingMutation,
-} from "@/client/@tanstack/react-query.gen";
+} from "@/client";
 import { useInvalidateByIds } from "./useInvalidateQueries";
 
 export function useResolveDeviceCode(code: string) {
diff --git a/ui/apps/console/src/hooks/useDeviceMutations.ts b/ui/apps/console/src/hooks/useDeviceMutations.ts
index 2f02984e8ee..86972aa3340 100644
--- a/ui/apps/console/src/hooks/useDeviceMutations.ts
+++ b/ui/apps/console/src/hooks/useDeviceMutations.ts
@@ -8,8 +8,9 @@ import {
   pullTagFromDeviceMutation,
   setDeviceCustomFieldMutation,
   deleteDeviceCustomFieldMutation,
-} from "../client/@tanstack/react-query.gen";
-import { createTag, pushTagToDevice } from "../client";
+  createTag,
+  pushTagToDevice,
+} from "../client";
 import { useInvalidateByIds } from "./useInvalidateQueries";
 
 export function useAcceptDevice() {
diff --git a/ui/apps/console/src/hooks/useDevices.ts b/ui/apps/console/src/hooks/useDevices.ts
index c62b892543c..dc928fd0c7f 100644
--- a/ui/apps/console/src/hooks/useDevices.ts
+++ b/ui/apps/console/src/hooks/useDevices.ts
@@ -2,12 +2,12 @@ import { useMemo } from "react";
 import { useQuery } from "@tanstack/react-query";
 import {
   getDevices as getDevicesSdk,
+  getDevicesQueryKey,
   type GetDevicesData,
   type DeviceStatus,
+  type Device as GeneratedDevice,
 } from "../client";
-import { getDevicesQueryKey } from "../client/@tanstack/react-query.gen";
 import { paginatedQueryFn, type PaginatedResult } from "../api/pagination";
-import type { Device as GeneratedDevice } from "../client";
 import { toBase64Json } from "@/utils/encoding";
 import { normalizeDeviceTags } from "@/utils/deviceTags";
 
diff --git a/ui/apps/console/src/hooks/useFirewallRuleMutations.ts b/ui/apps/console/src/hooks/useFirewallRuleMutations.ts
index b5f5b4f4afa..5bedb773774 100644
--- a/ui/apps/console/src/hooks/useFirewallRuleMutations.ts
+++ b/ui/apps/console/src/hooks/useFirewallRuleMutations.ts
@@ -3,7 +3,7 @@ import {
   createFirewallRuleMutation,
   updateFirewallRuleMutation,
   deleteFirewallRuleMutation,
-} from "../client/@tanstack/react-query.gen";
+} from "../client";
 import { useInvalidateByIds } from "./useInvalidateQueries";
 
 export function useCreateFirewallRule() {
diff --git a/ui/apps/console/src/hooks/useFirewallRules.ts b/ui/apps/console/src/hooks/useFirewallRules.ts
index 24e6bd5441f..b924a00f285 100644
--- a/ui/apps/console/src/hooks/useFirewallRules.ts
+++ b/ui/apps/console/src/hooks/useFirewallRules.ts
@@ -2,10 +2,10 @@ import { useMemo } from "react";
 import { useQuery } from "@tanstack/react-query";
 import {
   getFirewallRules as getFirewallRulesSdk,
+  getFirewallRulesQueryKey,
   type GetFirewallRulesData,
   type FirewallRulesResponse,
 } from "../client";
-import { getFirewallRulesQueryKey } from "../client/@tanstack/react-query.gen";
 import { paginatedQueryFn, type PaginatedResult } from "../api/pagination";
 
 interface UseFirewallRulesParams {
diff --git a/ui/apps/console/src/hooks/useInstallKeyEvents.ts b/ui/apps/console/src/hooks/useInstallKeyEvents.ts
index 3c50037cb10..dfb7782a293 100644
--- a/ui/apps/console/src/hooks/useInstallKeyEvents.ts
+++ b/ui/apps/console/src/hooks/useInstallKeyEvents.ts
@@ -1,10 +1,10 @@
 import { useQuery } from "@tanstack/react-query";
 import {
   installKeyHistory,
+  installKeyHistoryQueryKey,
   type InstallKeyHistoryData,
   type InstallKeyEvent,
 } from "../client";
-import { installKeyHistoryQueryKey } from "../client/@tanstack/react-query.gen";
 import { paginatedQueryFn, type PaginatedResult } from "../api/pagination";
 
 interface UseInstallKeyEventsParams {
diff --git a/ui/apps/console/src/hooks/useInstallKeyMutations.ts b/ui/apps/console/src/hooks/useInstallKeyMutations.ts
index 56055f63c5c..d0fe2385f34 100644
--- a/ui/apps/console/src/hooks/useInstallKeyMutations.ts
+++ b/ui/apps/console/src/hooks/useInstallKeyMutations.ts
@@ -2,7 +2,7 @@ import { useMutation } from "@tanstack/react-query";
 import {
   installKeyCreateMutation,
   installKeyUpdateMutation,
-} from "../client/@tanstack/react-query.gen";
+} from "../client";
 import { useInvalidateByIds } from "./useInvalidateQueries";
 
 export function useCreateInstallKey() {
diff --git a/ui/apps/console/src/hooks/useInstallKeys.ts b/ui/apps/console/src/hooks/useInstallKeys.ts
index af6af03ca7a..425dddc412f 100644
--- a/ui/apps/console/src/hooks/useInstallKeys.ts
+++ b/ui/apps/console/src/hooks/useInstallKeys.ts
@@ -1,6 +1,10 @@
 import { useQuery } from "@tanstack/react-query";
-import { installKeyList, type InstallKeyListData, type InstallKey } from "../client";
-import { installKeyListQueryKey } from "../client/@tanstack/react-query.gen";
+import {
+  installKeyList,
+  installKeyListQueryKey,
+  type InstallKeyListData,
+  type InstallKey,
+} from "../client";
 import { paginatedQueryFn, type PaginatedResult } from "../api/pagination";
 
 interface UseInstallKeysParams {
diff --git a/ui/apps/console/src/hooks/useInvitationMutations.ts b/ui/apps/console/src/hooks/useInvitationMutations.ts
index 38214c0f07a..156ac8c483e 100644
--- a/ui/apps/console/src/hooks/useInvitationMutations.ts
+++ b/ui/apps/console/src/hooks/useInvitationMutations.ts
@@ -3,7 +3,7 @@ import {
   acceptInviteMutation,
   generateInvitationLinkMutation,
   cancelMembershipInvitationMutation,
-} from "@/client/@tanstack/react-query.gen";
+} from "@/client";
 import { useInvalidateByIds } from "./useInvalidateQueries";
 
 export function useAcceptInvite() {
diff --git a/ui/apps/console/src/hooks/useInvitations.ts b/ui/apps/console/src/hooks/useInvitations.ts
index 13b95ebddf1..268ec93adf7 100644
--- a/ui/apps/console/src/hooks/useInvitations.ts
+++ b/ui/apps/console/src/hooks/useInvitations.ts
@@ -1,13 +1,11 @@
 import { useQuery } from "@tanstack/react-query";
 import {
   getNamespaceMembershipInvitationList,
+  getNamespaceMembershipInvitationListQueryKey,
+  resolveInvitationOptions,
   type GetNamespaceMembershipInvitationListData,
   type MembershipInvitation,
 } from "@/client";
-import {
-  getNamespaceMembershipInvitationListQueryKey,
-  resolveInvitationOptions,
-} from "@/client/@tanstack/react-query.gen";
 import { paginatedQueryFn, type PaginatedResult } from "@/api/pagination";
 import {
   invitationStatusFilter,
diff --git a/ui/apps/console/src/hooks/useLatestAnnouncement.ts b/ui/apps/console/src/hooks/useLatestAnnouncement.ts
index 941a10c0972..a57fe63635e 100644
--- a/ui/apps/console/src/hooks/useLatestAnnouncement.ts
+++ b/ui/apps/console/src/hooks/useLatestAnnouncement.ts
@@ -3,7 +3,7 @@ import { getConfig } from "@/env";
 import {
   listAnnouncementsOptions,
   getAnnouncementOptions,
-} from "@/client/@tanstack/react-query.gen";
+} from "@/client";
 
 export function useLatestAnnouncement() {
   const enabled = getConfig().announcements;
diff --git a/ui/apps/console/src/hooks/useMemberMutations.ts b/ui/apps/console/src/hooks/useMemberMutations.ts
index bdac03d5dba..ee9cfa28864 100644
--- a/ui/apps/console/src/hooks/useMemberMutations.ts
+++ b/ui/apps/console/src/hooks/useMemberMutations.ts
@@ -4,7 +4,7 @@ import {
   approveUserMutation,
   removeNamespaceMemberMutation,
   updateNamespaceMemberMutation,
-} from "../client/@tanstack/react-query.gen";
+} from "../client";
 import { useInvalidateByIds } from "./useInvalidateQueries";
 
 export function useAddMember() {
diff --git a/ui/apps/console/src/hooks/useNamespaceMutations.ts b/ui/apps/console/src/hooks/useNamespaceMutations.ts
index 93ba82b7da8..8200e9d7c68 100644
--- a/ui/apps/console/src/hooks/useNamespaceMutations.ts
+++ b/ui/apps/console/src/hooks/useNamespaceMutations.ts
@@ -2,8 +2,6 @@ import { useMutation } from "@tanstack/react-query";
 import {
   editNamespaceMutation,
   setSshAccessModeMutation,
-} from "../client/@tanstack/react-query.gen";
-import {
   getNamespaceToken,
   createNamespace as createNamespaceSdk,
   deleteNamespace as deleteNamespaceSdk,
diff --git a/ui/apps/console/src/hooks/useNamespaces.ts b/ui/apps/console/src/hooks/useNamespaces.ts
index 07c1ce617e2..407ced8113d 100644
--- a/ui/apps/console/src/hooks/useNamespaces.ts
+++ b/ui/apps/console/src/hooks/useNamespaces.ts
@@ -1,15 +1,13 @@
 import { useEffect } from "react";
 import { useQuery } from "@tanstack/react-query";
 import {
+  type Namespace as GeneratedNamespace,
+  type NamespaceMemberRole,
+  type MemberView,
   getNamespacesOptions,
   getNamespaceOptions,
   getNamespaceTokenOptions,
   listNamespaceMembersOptions,
-} from "../client/@tanstack/react-query.gen";
-import type {
-  Namespace as GeneratedNamespace,
-  NamespaceMemberRole,
-  MemberView,
 } from "../client";
 import { useAuthStore } from "../stores/authStore";
 
diff --git a/ui/apps/console/src/hooks/usePublicKeyMutations.ts b/ui/apps/console/src/hooks/usePublicKeyMutations.ts
index 99dcb5353fb..27e1de78476 100644
--- a/ui/apps/console/src/hooks/usePublicKeyMutations.ts
+++ b/ui/apps/console/src/hooks/usePublicKeyMutations.ts
@@ -3,7 +3,7 @@ import {
   createPublicKeyMutation,
   updatePublicKeyMutation,
   deletePublicKeyMutation,
-} from "../client/@tanstack/react-query.gen";
+} from "../client";
 import { useInvalidateByIds } from "./useInvalidateQueries";
 
 export function useCreatePublicKey() {
diff --git a/ui/apps/console/src/hooks/usePublicKeys.ts b/ui/apps/console/src/hooks/usePublicKeys.ts
index 627aad41301..499f8e6688a 100644
--- a/ui/apps/console/src/hooks/usePublicKeys.ts
+++ b/ui/apps/console/src/hooks/usePublicKeys.ts
@@ -2,10 +2,10 @@ import { useMemo } from "react";
 import { useQuery } from "@tanstack/react-query";
 import {
   getPublicKeys as getPublicKeysSdk,
+  getPublicKeysQueryKey,
   type GetPublicKeysData,
   type PublicKeyResponse,
 } from "../client";
-import { getPublicKeysQueryKey } from "../client/@tanstack/react-query.gen";
 import { paginatedQueryFn, type PaginatedResult } from "../api/pagination";
 import { toBase64Json } from "@/utils/encoding";
 
diff --git a/ui/apps/console/src/hooks/useRevealInstallKey.ts b/ui/apps/console/src/hooks/useRevealInstallKey.ts
index dd90573f6ed..726d940430a 100644
--- a/ui/apps/console/src/hooks/useRevealInstallKey.ts
+++ b/ui/apps/console/src/hooks/useRevealInstallKey.ts
@@ -1,5 +1,5 @@
 import { useQuery } from "@tanstack/react-query";
-import { installKeyRevealOptions } from "../client/@tanstack/react-query.gen";
+import { installKeyRevealOptions } from "../client";
 
 /**
  * Reveal a install key's plaintext on demand. The secret is never preloaded for
diff --git a/ui/apps/console/src/hooks/useSSHIdentities.ts b/ui/apps/console/src/hooks/useSSHIdentities.ts
index ad850cb64af..1f187ba51f3 100644
--- a/ui/apps/console/src/hooks/useSSHIdentities.ts
+++ b/ui/apps/console/src/hooks/useSSHIdentities.ts
@@ -1,7 +1,6 @@
 import { useMemo } from "react";
 import { useQuery } from "@tanstack/react-query";
-import { listSshIdentitiesOptions } from "../client/@tanstack/react-query.gen";
-import type { SshIdentity } from "../client";
+import { listSshIdentitiesOptions, type SshIdentity } from "../client";
 
 export function useSSHIdentities(all = false) {
   const options = all ? { query: { all: true } } : {};
diff --git a/ui/apps/console/src/hooks/useSSHIdentityMutations.ts b/ui/apps/console/src/hooks/useSSHIdentityMutations.ts
index 5d30e9e2b1e..4241488a3f0 100644
--- a/ui/apps/console/src/hooks/useSSHIdentityMutations.ts
+++ b/ui/apps/console/src/hooks/useSSHIdentityMutations.ts
@@ -5,7 +5,7 @@ import {
   createSshIdentityMutation,
   renameSshIdentityMutation,
   deleteSshIdentityMutation,
-} from "../client/@tanstack/react-query.gen";
+} from "../client";
 import { useInvalidateByIds } from "./useInvalidateQueries";
 
 export function useConfirmSSHApproval() {
diff --git a/ui/apps/console/src/hooks/useServiceAccountMutations.ts b/ui/apps/console/src/hooks/useServiceAccountMutations.ts
index b14de6f8371..c165153f2b7 100644
--- a/ui/apps/console/src/hooks/useServiceAccountMutations.ts
+++ b/ui/apps/console/src/hooks/useServiceAccountMutations.ts
@@ -2,7 +2,7 @@ import { useMutation } from "@tanstack/react-query";
 import {
   createServiceAccountMutation,
   deleteServiceAccountMutation,
-} from "../client/@tanstack/react-query.gen";
+} from "../client";
 import { useInvalidateByIds } from "./useInvalidateQueries";
 
 export function useCreateServiceAccount() {
diff --git a/ui/apps/console/src/hooks/useServiceAccounts.ts b/ui/apps/console/src/hooks/useServiceAccounts.ts
index 8530667da89..6a65874ff40 100644
--- a/ui/apps/console/src/hooks/useServiceAccounts.ts
+++ b/ui/apps/console/src/hooks/useServiceAccounts.ts
@@ -1,7 +1,6 @@
 import { useMemo } from "react";
 import { useQuery } from "@tanstack/react-query";
-import { listServiceAccountsOptions } from "../client/@tanstack/react-query.gen";
-import type { ServiceAccount } from "../client";
+import { listServiceAccountsOptions, type ServiceAccount } from "../client";
 
 export function useServiceAccounts() {
   const result = useQuery(listServiceAccountsOptions());
diff --git a/ui/apps/console/src/hooks/useSession.ts b/ui/apps/console/src/hooks/useSession.ts
index 04203cd7dd7..b5b59bf031a 100644
--- a/ui/apps/console/src/hooks/useSession.ts
+++ b/ui/apps/console/src/hooks/useSession.ts
@@ -1,5 +1,5 @@
 import { useQuery } from "@tanstack/react-query";
-import { getSessionOptions } from "../client/@tanstack/react-query.gen";
+import { getSessionOptions } from "../client";
 
 export function useSession(uid: string) {
   const result = useQuery({
diff --git a/ui/apps/console/src/hooks/useSessionMutations.ts b/ui/apps/console/src/hooks/useSessionMutations.ts
index 213cdce93a6..50c2923374c 100644
--- a/ui/apps/console/src/hooks/useSessionMutations.ts
+++ b/ui/apps/console/src/hooks/useSessionMutations.ts
@@ -1,6 +1,5 @@
 import { useMutation } from "@tanstack/react-query";
-import { clsoeSessionMutation } from "../client/@tanstack/react-query.gen";
-import { deleteSessionRecord } from "@/client";
+import { clsoeSessionMutation, deleteSessionRecord } from "../client";
 import { useInvalidateByIds } from "./useInvalidateQueries";
 
 export function useCloseSession() {
diff --git a/ui/apps/console/src/hooks/useSessions.ts b/ui/apps/console/src/hooks/useSessions.ts
index 2c55f5b990e..bd172d0e76e 100644
--- a/ui/apps/console/src/hooks/useSessions.ts
+++ b/ui/apps/console/src/hooks/useSessions.ts
@@ -1,10 +1,10 @@
 import { useQuery } from "@tanstack/react-query";
 import {
   getSessions as getSessionsSdk,
+  getSessionsQueryKey,
   type GetSessionsData,
   type Session,
 } from "../client";
-import { getSessionsQueryKey } from "../client/@tanstack/react-query.gen";
 import { paginatedQueryFn, type PaginatedResult } from "../api/pagination";
 
 interface UseSessionsParams {
diff --git a/ui/apps/console/src/hooks/useStats.ts b/ui/apps/console/src/hooks/useStats.ts
index 2bbe22e8f10..5cd6c070b36 100644
--- a/ui/apps/console/src/hooks/useStats.ts
+++ b/ui/apps/console/src/hooks/useStats.ts
@@ -1,5 +1,5 @@
 import { useQuery } from "@tanstack/react-query";
-import { getStatusDevicesOptions } from "../client/@tanstack/react-query.gen";
+import { getStatusDevicesOptions } from "../client";
 
 export function useStats() {
   const result = useQuery(getStatusDevicesOptions());
diff --git a/ui/apps/console/src/hooks/useSupportIdentifier.ts b/ui/apps/console/src/hooks/useSupportIdentifier.ts
index 31f3bb46ecc..d51daacbebe 100644
--- a/ui/apps/console/src/hooks/useSupportIdentifier.ts
+++ b/ui/apps/console/src/hooks/useSupportIdentifier.ts
@@ -1,5 +1,5 @@
 import { useQuery } from "@tanstack/react-query";
-import { getNamespaceSupportOptions } from "@/client/@tanstack/react-query.gen";
+import { getNamespaceSupportOptions } from "@/client";
 
 export function useSupportIdentifier(
   tenantId: string | null | undefined,
diff --git a/ui/apps/console/src/hooks/useTagMutations.ts b/ui/apps/console/src/hooks/useTagMutations.ts
index b5e983ebbf0..befe8384335 100644
--- a/ui/apps/console/src/hooks/useTagMutations.ts
+++ b/ui/apps/console/src/hooks/useTagMutations.ts
@@ -3,7 +3,7 @@ import {
   createTagMutation,
   deleteTagMutation,
   updateTagMutation,
-} from "../client/@tanstack/react-query.gen";
+} from "../client";
 import { useInvalidateByIds } from "./useInvalidateQueries";
 
 export function useCreateTag() {
diff --git a/ui/apps/console/src/hooks/useTags.ts b/ui/apps/console/src/hooks/useTags.ts
index 756afd8f2c7..58056b121cf 100644
--- a/ui/apps/console/src/hooks/useTags.ts
+++ b/ui/apps/console/src/hooks/useTags.ts
@@ -1,10 +1,10 @@
 import { useQuery } from "@tanstack/react-query";
 import {
   getTags as getTagsSdk,
+  getTagsQueryKey,
   type GetTagsData,
   type Tag,
 } from "../client";
-import { getTagsQueryKey } from "../client/@tanstack/react-query.gen";
 import { paginatedQueryFn, type PaginatedResult } from "../api/pagination";
 
 interface UseTagsParams {
diff --git a/ui/apps/console/src/hooks/useUploadLicense.ts b/ui/apps/console/src/hooks/useUploadLicense.ts
index 8134226a88f..a6b157c08d0 100644
--- a/ui/apps/console/src/hooks/useUploadLicense.ts
+++ b/ui/apps/console/src/hooks/useUploadLicense.ts
@@ -1,5 +1,5 @@
 import { useMutation } from "@tanstack/react-query";
-import { sendLicenseMutation } from "../client/@tanstack/react-query.gen";
+import { sendLicenseMutation } from "../client";
 import { useInvalidateByIds } from "./useInvalidateQueries";
 
 export function useUploadLicense() {
diff --git a/ui/apps/console/src/hooks/useWebEndpointMutations.ts b/ui/apps/console/src/hooks/useWebEndpointMutations.ts
index a95deba05fb..e2603427788 100644
--- a/ui/apps/console/src/hooks/useWebEndpointMutations.ts
+++ b/ui/apps/console/src/hooks/useWebEndpointMutations.ts
@@ -2,7 +2,7 @@ import { useMutation } from "@tanstack/react-query";
 import {
   createWebEndpointMutation,
   deleteWebEndpointMutation,
-} from "../client/@tanstack/react-query.gen";
+} from "../client";
 import { useInvalidateByIds } from "./useInvalidateQueries";
 
 export function useCreateWebEndpoint() {
diff --git a/ui/apps/console/src/hooks/useWebEndpoints.ts b/ui/apps/console/src/hooks/useWebEndpoints.ts
index ea5976c9624..6b126f6427e 100644
--- a/ui/apps/console/src/hooks/useWebEndpoints.ts
+++ b/ui/apps/console/src/hooks/useWebEndpoints.ts
@@ -1,10 +1,10 @@
 import { useQuery } from "@tanstack/react-query";
 import {
   listWebEndpoints as listWebEndpointsSdk,
+  listWebEndpointsQueryKey,
   type ListWebEndpointsData,
   type Webendpoint,
 } from "../client";
-import { listWebEndpointsQueryKey } from "../client/@tanstack/react-query.gen";
 import { paginatedQueryFn, type PaginatedResult } from "../api/pagination";
 import { toBase64Json } from "@/utils/encoding";
 
diff --git a/ui/apps/console/src/pages/__tests__/WebEndpoints.test.tsx b/ui/apps/console/src/pages/__tests__/WebEndpoints.test.tsx
index 1d0e34960db..023c251e906 100644
--- a/ui/apps/console/src/pages/__tests__/WebEndpoints.test.tsx
+++ b/ui/apps/console/src/pages/__tests__/WebEndpoints.test.tsx
@@ -2,7 +2,7 @@ import { describe, it, expect, vi, beforeEach } from "vitest";
 import { render, screen } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
 import { MemoryRouter } from "react-router-dom";
-import type { Webendpoint } from "@/client/types.gen";
+import type { Webendpoint } from "@/client";
 import WebEndpoints from "../WebEndpoints";
 
 vi.mock("@/hooks/useWebEndpoints");
diff --git a/ui/apps/console/src/pages/admin/License.tsx b/ui/apps/console/src/pages/admin/License.tsx
index d061b29fcaf..a18a6df5096 100644
--- a/ui/apps/console/src/pages/admin/License.tsx
+++ b/ui/apps/console/src/pages/admin/License.tsx
@@ -25,7 +25,7 @@ import {
   validateLicenseFile,
   getLicenseAlertConfig,
 } from "@/utils/license";
-import type { GetLicenseResponse } from "@/client/types.gen";
+import type { GetLicenseResponse } from "@/client";
 import PageLoader from "@/components/common/PageLoader";
 import { Button, Card, IconButton } from "@shellhub/design-system/primitives";
 
diff --git a/ui/apps/console/src/utils/license.ts b/ui/apps/console/src/utils/license.ts
index 449f6096b2c..3127034072c 100644
--- a/ui/apps/console/src/utils/license.ts
+++ b/ui/apps/console/src/utils/license.ts
@@ -1,5 +1,5 @@
 import { formatExpiry } from "./date";
-import type { GetLicenseResponse } from "../client/types.gen";
+import type { GetLicenseResponse } from "../client";
 
 export function formatLicenseTimestamp(value: number): string {
   if (value === -1) return "Now";