refactor(web-shared): import web-shared via @kilocode/web-shared

.oxlintrc.json

@@ -178,6 +178,22 @@
         "@typescript-eslint/unbound-method": "error"
       }
     },
+    {
+      "files": ["packages/web-shared/**/*.ts", "packages/web-shared/**/*.tsx"],
+      "rules": {
+        "no-restricted-imports": [
+          "error",
+          {
+            "patterns": [
+              {
+                "group": ["**/apps/web/**", "@/**"],
+                "message": "packages/web-shared must not import from apps/web."
+              }
+            ]
+          }
+        ]
+      }
+    },
     {
       "files": ["packages/web-shared/**/*.ts"],
       "rules": {

apps/ai-gateway/AGENTS.md

@@ -11,8 +11,8 @@ Next.js app that serves the AI gateway API on its own. It is not deployed yet;
   move under `/api/v1` too; the latter becomes `/api/v1/systemone`.
 - Route files are thin facades over handlers in `packages/web-shared`. Keep the
   `apps/web` `maxDuration` and `withRestTiming` usage, with route patterns that
-  match this app's paths. See `packages/web-shared/AGENTS.md` for how `@/`
-  imports resolve.
+  match this app's paths. Import handlers as `@kilocode/web-shared/<path>`;
+  `@/` resolves only to this app's `src`. See `packages/web-shared/AGENTS.md`.
 - Handlers that depend on the path accept both apps' paths, such as the LLM
   proxy's path validation.
 - `pnpm dev` runs with the web app's environment files. Start it with

apps/ai-gateway/src/app/api/v1/[...path]/route.ts

@@ -1,6 +1,6 @@
 import type { NextRequest } from 'next/server';
-import { handleLlmProxyRequest } from '@/lib/ai-gateway/handlers/llm-proxy';
-import { withRestTiming } from '@/lib/observability/request-timing';
+import { handleLlmProxyRequest } from '@kilocode/web-shared/lib/ai-gateway/handlers/llm-proxy';
+import { withRestTiming } from '@kilocode/web-shared/lib/observability/request-timing';
 
 export const POST = withRestTiming('/api/v1/[...path]', (request: Request) =>
   handleLlmProxyRequest(request as NextRequest)

apps/ai-gateway/src/app/api/v1/audio/transcriptions/route.ts

@@ -1,6 +1,6 @@
 import type { NextRequest } from 'next/server';
-import { handleAudioTranscriptionsRequest } from '@/lib/ai-gateway/handlers/audio-transcriptions';
-import { withRestTiming } from '@/lib/observability/request-timing';
+import { handleAudioTranscriptionsRequest } from '@kilocode/web-shared/lib/ai-gateway/handlers/audio-transcriptions';
+import { withRestTiming } from '@kilocode/web-shared/lib/observability/request-timing';
 
 export const POST = withRestTiming('/api/v1/audio/transcriptions', (request: Request) =>
   handleAudioTranscriptionsRequest(request as NextRequest)

apps/ai-gateway/src/app/api/v1/edit/completions/route.ts

@@ -1 +1 @@
-export { handleEditCompletionsRequest as POST } from '@/lib/ai-gateway/handlers/edit-completions';
+export { handleEditCompletionsRequest as POST } from '@kilocode/web-shared/lib/ai-gateway/handlers/edit-completions';

apps/ai-gateway/src/app/api/v1/embedding-models/route.ts

@@ -1 +1 @@
-export { handleEmbeddingModelsRequest as GET } from '@/lib/ai-gateway/handlers/embedding-models';
+export { handleEmbeddingModelsRequest as GET } from '@kilocode/web-shared/lib/ai-gateway/handlers/embedding-models';

apps/ai-gateway/src/app/api/v1/embeddings/route.ts

@@ -1,3 +1,3 @@
-export { handleEmbeddingsRequest as POST } from '@/lib/ai-gateway/handlers/embeddings';
+export { handleEmbeddingsRequest as POST } from '@kilocode/web-shared/lib/ai-gateway/handlers/embeddings';
 
 export const maxDuration = 300;

apps/ai-gateway/src/app/api/v1/fim/completions/route.ts

@@ -1 +1 @@
-export { handleFimCompletionsRequest as POST } from '@/lib/ai-gateway/handlers/fim-completions';
+export { handleFimCompletionsRequest as POST } from '@kilocode/web-shared/lib/ai-gateway/handlers/fim-completions';

apps/ai-gateway/src/app/api/v1/models-by-provider/route.ts

@@ -1,4 +1,4 @@
-import { handleModelsByProviderRequest } from '@/lib/ai-gateway/handlers/models-by-provider';
-import { withRestTiming } from '@/lib/observability/request-timing';
+import { handleModelsByProviderRequest } from '@kilocode/web-shared/lib/ai-gateway/handlers/models-by-provider';
+import { withRestTiming } from '@kilocode/web-shared/lib/observability/request-timing';
 
 export const GET = withRestTiming('/api/v1/models-by-provider', handleModelsByProviderRequest);

apps/ai-gateway/src/app/api/v1/models/[provider]/[model]/endpoints/route.ts

@@ -1 +1 @@
-export { handleModelEndpointsRequest as GET } from '@/lib/ai-gateway/handlers/model-endpoints';
+export { handleModelEndpointsRequest as GET } from '@kilocode/web-shared/lib/ai-gateway/handlers/model-endpoints';

apps/ai-gateway/src/app/api/v1/models/route.ts

@@ -1,4 +1,4 @@
-import { handleModelsRequest } from '@/lib/ai-gateway/handlers/models';
-import { withRestTiming } from '@/lib/observability/request-timing';
+import { handleModelsRequest } from '@kilocode/web-shared/lib/ai-gateway/handlers/models';
+import { withRestTiming } from '@kilocode/web-shared/lib/observability/request-timing';
 
 export const GET = withRestTiming('/api/v1/models', handleModelsRequest);

apps/ai-gateway/src/app/api/v1/models/validate/route.ts

@@ -1 +1 @@
-export { handleModelValidationRequest as POST } from '@/lib/ai-gateway/handlers/model-validation';
+export { handleModelValidationRequest as POST } from '@kilocode/web-shared/lib/ai-gateway/handlers/model-validation';

apps/ai-gateway/src/app/api/v1/organizations/[id]/models/route.ts

@@ -1 +1 @@
-export { handleOrganizationModelsRequest as GET } from '@/lib/ai-gateway/handlers/organization-models';
+export { handleOrganizationModelsRequest as GET } from '@kilocode/web-shared/lib/ai-gateway/handlers/organization-models';

apps/ai-gateway/src/app/api/v1/organizations/[id]/models/validate/route.ts

@@ -1 +1 @@
-export { handleOrganizationModelValidationRequest as POST } from '@/lib/ai-gateway/handlers/organization-model-validation';
+export { handleOrganizationModelValidationRequest as POST } from '@kilocode/web-shared/lib/ai-gateway/handlers/organization-model-validation';

apps/ai-gateway/src/app/api/v1/providers/route.ts

@@ -1,4 +1,4 @@
-import { handleProvidersRequest } from '@/lib/ai-gateway/handlers/providers';
-import { withRestTiming } from '@/lib/observability/request-timing';
+import { handleProvidersRequest } from '@kilocode/web-shared/lib/ai-gateway/handlers/providers';
+import { withRestTiming } from '@kilocode/web-shared/lib/observability/request-timing';
 
 export const GET = withRestTiming('/api/v1/providers', handleProvidersRequest);

apps/ai-gateway/src/app/api/v1/systemone/route.ts

@@ -1,3 +1,3 @@
-export { handleSystemOneRequest as POST } from '@/lib/ai-gateway/typesafe/handler';
+export { handleSystemOneRequest as POST } from '@kilocode/web-shared/lib/ai-gateway/typesafe/handler';
 
 export const maxDuration = 800;

apps/ai-gateway/src/app/api/v1/transcription-models/route.ts

@@ -1,4 +1,4 @@
-import { handleTranscriptionModelsRequest } from '@/lib/ai-gateway/handlers/transcription-models';
-import { withRestTiming } from '@/lib/observability/request-timing';
+import { handleTranscriptionModelsRequest } from '@kilocode/web-shared/lib/ai-gateway/handlers/transcription-models';
+import { withRestTiming } from '@kilocode/web-shared/lib/observability/request-timing';
 
 export const GET = withRestTiming('/api/v1/transcription-models', handleTranscriptionModelsRequest);

apps/ai-gateway/tsconfig.json

@@ -9,7 +9,8 @@
     "skipLibCheck": true,
     "forceConsistentCasingInFileNames": true,
     "paths": {
-      "@/*": ["./src/*", "../../packages/web-shared/src/*"],
+      "@/*": ["./src/*"],
+      "@kilocode/web-shared/*": ["../../packages/web-shared/src/*"],
       "@kilocode/db": ["../../packages/db/src/index.ts"],
       "@kilocode/db/*": ["../../packages/db/src/*"],
       "@kilocode/encryption": ["../../packages/encryption/src/index.ts"],

apps/storybook/.storybook/main.ts

@@ -42,7 +42,8 @@ const config: StorybookConfig = {
     if (config.resolve) {
       config.resolve.alias = {
         ...config.resolve.alias,
-        '@': [srcDir, webSharedSrcDir],
+        '@': srcDir,
+        '@kilocode/web-shared': webSharedSrcDir,
         '@/lib/utils': resolve(mocksDir, 'utils.ts'),
       };
     }

apps/storybook/src/components/TrialStateSlider.tsx

@@ -4,7 +4,7 @@ import React, { useState } from 'react';
 import {
   getOrgTrialStatusFromDays,
   type OrganizationTrialDisplayStatus,
-} from '@/lib/organizations/trial-utils';
+} from '@kilocode/web-shared/lib/organizations/trial-utils';
 
 type TrialStateSliderProps = {
   children: (props: {

apps/storybook/src/mockData/organizations.ts

@@ -2,8 +2,8 @@ import { generateMock } from '@anatine/zod-mock';
 import type {
   OrganizationWithMembers,
   OrganizationMember,
-} from '@/lib/organizations/organization-types';
-import { OrganizationSchema } from '@/lib/organizations/organization-types';
+} from '@kilocode/web-shared/lib/organizations/organization-types';
+import { OrganizationSchema } from '@kilocode/web-shared/lib/organizations/organization-types';
 import { mockDataRng as rng, randomChoice, randomBoolean, randomId, randomInt } from './random';
 import { COMPANY_TYPES, ORG_ROLES, ORG_STATUSES } from './constants';
 

apps/storybook/src/mockData/providers.ts

@@ -1,7 +1,7 @@
 import { generateMock } from '@anatine/zod-mock';
 import type { OpenRouterProvider } from '@/components/models/util';
-import type { OpenRouterModel } from '@/lib/ai-gateway/providers/openrouter/openrouter-types';
-import { OpenRouterModel as OpenRouterModelSchema } from '@/lib/ai-gateway/providers/openrouter/openrouter-types';
+import type { OpenRouterModel } from '@kilocode/web-shared/lib/ai-gateway/providers/openrouter/openrouter-types';
+import { OpenRouterModel as OpenRouterModelSchema } from '@kilocode/web-shared/lib/ai-gateway/providers/openrouter/openrouter-types';
 import { mockDataRng as rng, randomChoice, randomBoolean, randomInt } from './random';
 import {
   MODELS,

apps/storybook/stories/PlanCard.stories.tsx

@@ -7,7 +7,7 @@ import {
 import {
   TEAM_SEAT_PRICE_MONTHLY_USD,
   ENTERPRISE_SEAT_PRICE_MONTHLY_USD,
-} from '@/lib/organizations/constants';
+} from '@kilocode/web-shared/lib/organizations/constants';
 
 const meta: Meta<typeof PlanCard> = {
   title: 'Organizations/Components/Plan Card',

apps/storybook/tsconfig.json

@@ -21,6 +21,7 @@
     "../web/src/**/*.test.ts",
     "../web/src/**/*.test.tsx",
     "../../packages/web-shared/src/**/*.test.ts",
+    "../../packages/web-shared/src/tests/**",
     "../web/src/tests/**",
     "../web/src/**/*test-utils*",
     "../web/tests/**"

apps/web/jest.config.ts

@@ -31,8 +31,9 @@ const config: Config = {
     '^@kilocode/worker-utils/(.*)$': '<rootDir>/../../packages/worker-utils/src/$1',
     '^@kilocode/worker-utils$': '<rootDir>/../../packages/worker-utils/src/index.ts',
     '^@kilocode/app-shared/(.*)$': '<rootDir>/../../packages/app-shared/src/$1',
+    '^@kilocode/web-shared/(.*)$': '<rootDir>/../../packages/web-shared/src/$1',
     '^(\\.{1,2}/.+)\\.js$': '$1',
-    '^@/(.*)$': ['<rootDir>/src/$1', '<rootDir>/../../packages/web-shared/src/$1'],
+    '^@/(.*)$': '<rootDir>/src/$1',
     '^server-only$': '<rootDir>/src/tests/setup/__mocks__/server-only.js',
   },
   roots: ['<rootDir>', '<rootDir>/../../packages/web-shared'],

apps/web/src/app/(app)/app-builder/[projectId]/page.tsx

@@ -1,7 +1,7 @@
 import { notFound } from 'next/navigation';
 import { AppBuilderPage } from '@/components/app-builder/AppBuilderPage';
-import { isFeatureFlagEnabled } from '@/lib/posthog-feature-flags';
-import { getUserFromAuthOrRedirect } from '@/lib/user/server';
+import { isFeatureFlagEnabled } from '@kilocode/web-shared/lib/posthog-feature-flags';
+import { getUserFromAuthOrRedirect } from '@kilocode/web-shared/lib/user/server';
 
 type Props = {
   params: Promise<{ projectId: string }>;

apps/web/src/app/(app)/app-builder/page.tsx

@@ -1,7 +1,7 @@
 import { notFound } from 'next/navigation';
 import { AppBuilderPage } from '@/components/app-builder/AppBuilderPage';
-import { isFeatureFlagEnabled } from '@/lib/posthog-feature-flags';
-import { getUserFromAuthOrRedirect } from '@/lib/user/server';
+import { isFeatureFlagEnabled } from '@kilocode/web-shared/lib/posthog-feature-flags';
+import { getUserFromAuthOrRedirect } from '@kilocode/web-shared/lib/user/server';
 
 export default async function CreatePage() {
   const user = await getUserFromAuthOrRedirect('/users/sign_in?callbackPath=/app-builder');

apps/web/src/app/(app)/auto-fix/page.tsx

@@ -1,6 +1,6 @@
-import { getUserFromAuthOrRedirect } from '@/lib/user/server';
+import { getUserFromAuthOrRedirect } from '@kilocode/web-shared/lib/user/server';
 import { AutoFixPageClient } from './AutoFixPageClient';
-import { isFeatureFlagEnabled } from '@/lib/posthog-feature-flags';
+import { isFeatureFlagEnabled } from '@kilocode/web-shared/lib/posthog-feature-flags';
 import { notFound } from 'next/navigation';
 
 type AutoFixPageProps = {

apps/web/src/app/(app)/auto-triage/page.tsx

@@ -1,6 +1,6 @@
 import { notFound } from 'next/navigation';
-import { isFeatureFlagEnabled } from '@/lib/posthog-feature-flags';
-import { getUserFromAuthOrRedirect } from '@/lib/user/server';
+import { isFeatureFlagEnabled } from '@kilocode/web-shared/lib/posthog-feature-flags';
+import { getUserFromAuthOrRedirect } from '@kilocode/web-shared/lib/user/server';
 import { AutoTriagePageClient } from './AutoTriagePageClient';
 
 type AutoTriagePageProps = {

apps/web/src/app/(app)/byok/layout.tsx

@@ -1,4 +1,4 @@
-import { getUserFromAuthOrRedirect } from '@/lib/user/server';
+import { getUserFromAuthOrRedirect } from '@kilocode/web-shared/lib/user/server';
 
 export default async function BYOKLayout({ children }: { children: React.ReactNode }) {
   await getUserFromAuthOrRedirect();

apps/web/src/app/(app)/claw/components/AutoModelPicker.tsx

@@ -5,7 +5,10 @@ import { CheckCircle2, ChevronDown, Scale, Zap } from 'lucide-react';
 import { Collapsible, CollapsibleContent, CollapsibleTrigger } from '@/components/ui/collapsible';
 import { ModelCombobox, type ModelOption } from '@/components/shared/ModelCombobox';
 import { cn } from '@/lib/utils';
-import { KILO_AUTO_BALANCED_MODEL, KILO_AUTO_FRONTIER_MODEL } from '@/lib/ai-gateway/auto-model';
+import {
+  KILO_AUTO_BALANCED_MODEL,
+  KILO_AUTO_FRONTIER_MODEL,
+} from '@kilocode/web-shared/lib/ai-gateway/auto-model';
 
 const AUTO_CARD_MODEL_IDS = new Set([KILO_AUTO_FRONTIER_MODEL.id, KILO_AUTO_BALANCED_MODEL.id]);
 

apps/web/src/app/(app)/claw/components/ClawOnboardingFlow.tsx

@@ -6,7 +6,7 @@ import { usePathname, useRouter, useSearchParams } from 'next/navigation';
 import { useFeatureFlagVariantKey, usePostHog } from 'posthog-js/react';
 import { toast } from 'sonner';
 import { Loader2, TriangleAlert, X } from 'lucide-react';
-import { KILO_AUTO_BALANCED_MODEL } from '@/lib/ai-gateway/auto-model';
+import { KILO_AUTO_BALANCED_MODEL } from '@kilocode/web-shared/lib/ai-gateway/auto-model';
 import type { KiloClawDashboardStatus } from '@/lib/kiloclaw/types';
 import { controllerVersionOk, gatewayStatusOk } from '@/lib/kiloclaw/types';
 import { useKiloClawGatewayStatus, useKiloClawMutations } from '@/hooks/useKiloClaw';

apps/web/src/app/(app)/claw/components/embeddingModels.ts

@@ -1,7 +1,7 @@
 import {
   KILO_DEFAULT_EMBEDDING_MODEL,
   KILO_EMBEDDING_MODELS,
-} from '@/lib/ai-gateway/embeddings/kilo-embedding-models';
+} from '@kilocode/web-shared/lib/ai-gateway/embeddings/kilo-embedding-models';
 
 export type EmbeddingModelOption = {
   id: string;

apps/web/src/app/(app)/claw/hooks/useDefaultModelSelection.ts

@@ -1,6 +1,6 @@
 import { useEffect, useState } from 'react';
 import type { ModelOption } from '@/components/shared/ModelCombobox';
-import { KILOCLAW_KILO_PROVIDER_PREFIX } from '@/lib/ai-gateway/model-utils';
+import { KILOCLAW_KILO_PROVIDER_PREFIX } from '@kilocode/web-shared/lib/ai-gateway/model-utils';
 
 export function getDefaultSelectedModel(
   kilocodeDefaultModel: string | null | undefined,

apps/web/src/app/(app)/claw/install/[source]/[slug]/page.tsx

@@ -1,6 +1,6 @@
 import { notFound, redirect } from 'next/navigation';
 import { TRPCError } from '@trpc/server';
-import { getUserFromAuthOrRedirect } from '@/lib/user/server';
+import { getUserFromAuthOrRedirect } from '@kilocode/web-shared/lib/user/server';
 import { requireKiloClawAccess } from '@/lib/kiloclaw/access-gate';
 import { fetchInstallPayload } from '@/lib/kiloclaw/install';
 import { INSTALL_SOURCES, isInstallSource } from '@/lib/kiloclaw/install-sources';

apps/web/src/app/(app)/claw/layout.tsx

@@ -1,4 +1,4 @@
-import { getUserFromAuthOrRedirect } from '@/lib/user/server';
+import { getUserFromAuthOrRedirect } from '@kilocode/web-shared/lib/user/server';
 import { PersonalInstancePresenceMount } from './components/PersonalInstancePresenceMount';
 
 export default async function ClawLayout({ children }: { children: React.ReactNode }) {

apps/web/src/app/(app)/cloud/(agent)/chat/page.tsx

@@ -1,4 +1,4 @@
-import { getUserFromAuthOrRedirect } from '@/lib/user/server';
+import { getUserFromAuthOrRedirect } from '@kilocode/web-shared/lib/user/server';
 import { isNewSession } from '@/lib/cloud-agent/session-type';
 import { LegacySessionViewer } from '@/components/cloud-agent-next/LegacySessionViewer';
 import { CloudChatPageWrapperNext } from './CloudChatPageWrapperNext';

apps/web/src/app/(app)/cloud/(agent)/layout.tsx

@@ -1,7 +1,7 @@
 import { Suspense } from 'react';
 import { CloudAgentProvider } from '@/components/cloud-agent-next/CloudAgentProvider';
 import { CloudSidebarLayout } from '@/components/cloud-agent-next/CloudSidebarLayout';
-import { getUserFromAuthOrRedirect } from '@/lib/user/server';
+import { getUserFromAuthOrRedirect } from '@kilocode/web-shared/lib/user/server';
 
 export default async function CloudAgentLayout({ children }: { children: React.ReactNode }) {
   const user = await getUserFromAuthOrRedirect();

apps/web/src/app/(app)/cloud/(agent)/page.tsx

@@ -1,5 +1,5 @@
-import { getUserFromAuthOrRedirect } from '@/lib/user/server';
-import { isFeatureFlagEnabledOrDevelopment } from '@/lib/posthog-feature-flags';
+import { getUserFromAuthOrRedirect } from '@kilocode/web-shared/lib/user/server';
+import { isFeatureFlagEnabledOrDevelopment } from '@kilocode/web-shared/lib/posthog-feature-flags';
 import { NewSessionPanel } from '@/components/cloud-agent-next/NewSessionPanel';
 
 export default async function PersonalCloudPage() {

apps/web/src/app/(app)/cloud/(agent)/sessions/[sessionId]/page.tsx

@@ -1,4 +1,4 @@
-import { getUserFromAuthOrRedirect } from '@/lib/user/server';
+import { getUserFromAuthOrRedirect } from '@kilocode/web-shared/lib/user/server';
 import { isNewSession } from '@/lib/cloud-agent/session-type';
 import { sessionResumeSignInPath } from '@/lib/cloud-agent/session-resume-target';
 import { LegacySessionViewer } from '@/components/cloud-agent-next/LegacySessionViewer';

apps/web/src/app/(app)/cloud/mcp-gateway/McpGatewayDetailContent.tsx

@@ -4,7 +4,7 @@ import Link from 'next/link';
 import { useRouter } from 'next/navigation';
 import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
 import { useTRPC } from '@/lib/trpc/utils';
-import type { OrganizationWithMembersResponse } from '@/lib/organizations/organization-types';
+import type { OrganizationWithMembersResponse } from '@kilocode/web-shared/lib/organizations/organization-types';
 import { getMcpGatewayRoutes } from '@/lib/mcp-gateway/routes';
 import { Button } from '@/components/ui/button';
 import { ConnectionStatusBadge } from './ConnectionStatusBadge';

apps/web/src/app/(app)/cloud/mcp-gateway/[configId]/page.tsx

@@ -1,4 +1,4 @@
-import { getUserFromAuth } from '@/lib/user/server';
+import { getUserFromAuth } from '@kilocode/web-shared/lib/user/server';
 import { notFound } from 'next/navigation';
 import { PageContainer } from '@/components/layouts/PageContainer';
 import { McpGatewayDetailContent } from '../McpGatewayDetailContent';

apps/web/src/app/(app)/cloud/mcp-gateway/new/page.tsx

@@ -1,4 +1,4 @@
-import { getUserFromAuth } from '@/lib/user/server';
+import { getUserFromAuth } from '@kilocode/web-shared/lib/user/server';
 import { notFound } from 'next/navigation';
 import { PageContainer } from '@/components/layouts/PageContainer';
 import { McpGatewaySetupContent } from '../McpGatewaySetupContent';

apps/web/src/app/(app)/cloud/mcp-gateway/page.tsx

@@ -1,4 +1,4 @@
-import { getUserFromAuth } from '@/lib/user/server';
+import { getUserFromAuth } from '@kilocode/web-shared/lib/user/server';
 import { notFound } from 'next/navigation';
 import { PageContainer } from '@/components/layouts/PageContainer';
 import { McpGatewayListContent } from './McpGatewayListContent';

apps/web/src/app/(app)/cloud/sessions/layout.tsx

@@ -1,4 +1,4 @@
-import { getUserFromAuthOrRedirect } from '@/lib/user/server';
+import { getUserFromAuthOrRedirect } from '@kilocode/web-shared/lib/user/server';
 import { smartAppBannerItunes } from '@/lib/smart-app-banner';
 
 export const metadata = { itunes: smartAppBannerItunes('/cloud/sessions') };

apps/web/src/app/(app)/cloud/triggers/layout.tsx

@@ -1,4 +1,4 @@
-import { getUserFromAuthOrRedirect } from '@/lib/user/server';
+import { getUserFromAuthOrRedirect } from '@kilocode/web-shared/lib/user/server';
 
 export default async function CloudTriggersLayout({ children }: { children: React.ReactNode }) {
   await getUserFromAuthOrRedirect();

apps/web/src/app/(app)/cloud/webhooks/layout.tsx

@@ -1,4 +1,4 @@
-import { getUserFromAuthOrRedirect } from '@/lib/user/server';
+import { getUserFromAuthOrRedirect } from '@kilocode/web-shared/lib/user/server';
 
 export default async function CloudWebhooksLayout({ children }: { children: React.ReactNode }) {
   await getUserFromAuthOrRedirect();

apps/web/src/app/(app)/code-indexing/page.tsx

@@ -1,4 +1,4 @@
-import { getUserFromAuthOrRedirect } from '@/lib/user/server';
+import { getUserFromAuthOrRedirect } from '@kilocode/web-shared/lib/user/server';
 import { CodeIndexingView } from '@/components/code-indexing/CodeIndexingView';
 import { isEnabledForUser } from '@/lib/code-indexing/util';
 import { Badge } from '@/components/ui/badge';

apps/web/src/app/(app)/code-reviews/[reviewId]/page.tsx

@@ -1,4 +1,4 @@
-import { getUserFromAuthOrRedirect } from '@/lib/user/server';
+import { getUserFromAuthOrRedirect } from '@kilocode/web-shared/lib/user/server';
 import { CodeReviewDetailClient } from './CodeReviewDetailClient';
 
 export default async function CodeReviewDetailPage({