refactor(ui): standardize generated client imports to use barrel

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,
     },
   ],
 });

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";

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"

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"]),
 }));
 

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"]),
 }));
 

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"]),
 }));
 

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,

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"]),
 }));
 

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";

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 })),

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],

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");
 }

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,

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,

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();

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);

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,

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));

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 })),
 }));
 

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());

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() {

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

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";