fix: resolve merge conflict in admin-queries.ts — keep both quote_items and service_catalog imports

src/lib/admin-queries.ts

@@ -9,6 +9,7 @@ import {
   documents,
   notes,
   time_entries,
+  quote_items,
   service_catalog,
 } from "@/db/schema";
 import { eq, inArray, asc, isNull, sql } from "drizzle-orm";
@@ -110,6 +111,17 @@ export async function getClientById(id: string) {
 
 // ── ClientFullDetail — used by /admin/clients/[id] workspace ─────────────────
 
+// quote_items NEVER exposed via client API — admin workspace query only
+export type QuoteItemWithLabel = {
+  id: string;
+  label: string;        // COALESCE(service_catalog.name, quote_items.custom_label)
+  custom_label: string | null;
+  service_id: string | null;
+  quantity: string;
+  unit_price: string;   // snapshotted — never joined back to service_catalog.unit_price
+  subtotal: string;
+};
+
 export type ClientFullDetail = {
   client: Client;
   phases: Array<Phase & { tasks: Array<Task & { deliverables: Deliverable[] }> }>;
@@ -117,6 +129,8 @@ export type ClientFullDetail = {
   documents: Document[];
   notes: Note[];
   comments: Comment[];
+  quoteItems: QuoteItemWithLabel[];
+  activeServices: ServiceCatalog[];
 };
 
 export async function getClientFullDetail(id: string): Promise<ClientFullDetail | null> {
@@ -182,6 +196,28 @@ export async function getClientFullDetail(id: string): Promise<ClientFullDetail
       })),
   }));
 
+  // quote_items NEVER exposed via client API — admin workspace query only
+  const quoteItemRows: QuoteItemWithLabel[] = await db
+    .select({
+      id: quote_items.id,
+      label: sql<string>`COALESCE(${service_catalog.name}, ${quote_items.custom_label})`,
+      custom_label: quote_items.custom_label,
+      service_id: quote_items.service_id,
+      quantity: quote_items.quantity,
+      unit_price: quote_items.unit_price,
+      subtotal: quote_items.subtotal,
+    })
+    .from(quote_items)
+    .leftJoin(service_catalog, eq(quote_items.service_id, service_catalog.id))
+    .where(eq(quote_items.client_id, id))
+    .orderBy(asc(quote_items.id));
+
+  const activeServiceRows = await db
+    .select()
+    .from(service_catalog)
+    .where(eq(service_catalog.active, true))
+    .orderBy(asc(service_catalog.name));
+
   return {
     client,
     phases: phasesWithTasks,
@@ -189,6 +225,8 @@ export async function getClientFullDetail(id: string): Promise<ClientFullDetail
     documents: documentsRows,
     notes: notesRows,
     comments: commentsRows,
+    quoteItems: quoteItemRows,
+    activeServices: activeServiceRows,
   };
 }