Merge Conflicts (#41)

Co-authored-by: Sayan Datta <sayan@Sayans-MacBook-Air.local>
Reviewed-on: #41

app/src/lib/api.ts

@@ -1,3 +1,5 @@
+import { buildVelocityHeaders } from '@/lib/velocitySession';
+
 const rawApiBase = import.meta.env.VITE_API_URL?.trim();
 const DEPLOYED_BACKEND_ORIGIN = 'https://velocity.desineuron.in';
 
@@ -75,10 +77,17 @@ export interface MarketingCampaignSummary {
 
 async function requestJson<T>(path: string): Promise<T> {
   const response = await fetch(`${API_URL}${path}`, {
-    headers: { Accept: 'application/json' },
+    headers: buildVelocityHeaders(undefined, false),
   });
   if (!response.ok) {
-    throw new Error(`Request failed: ${response.status}`);
+    const body = await response.json().catch(() => ({}));
+    throw new Error(
+      typeof body?.detail === 'string'
+        ? body.detail
+        : typeof body?.message === 'string'
+          ? body.message
+          : `Request failed: ${response.status}`,
+    );
   }
   return response.json() as Promise<T>;
 }

app/src/lib/crmApi.ts

@@ -8,6 +8,7 @@ import type {
   Client360Snapshot,
   CrmOpportunityCard,
   CrmTask,
+  CrmLeadStageUpdate,
   KanbanColumn,
   ImportBatchSummary,
   ImportProposal,
@@ -17,13 +18,12 @@ import type {
   OracleClientDataDetail,
   OracleClientTimelineItem,
 } from '@/types/crmTypes';
-import { VELOCITY_TOKEN_KEY } from '@/lib/velocityPlatformClient';
+import { buildVelocityHeaders } from '@/lib/velocitySession';
 
 const API_BASE = import.meta.env.VITE_API_BASE_URL ?? '';
 
 function getAuthHeaders(): Record<string, string> {
-  const token = localStorage.getItem(VELOCITY_TOKEN_KEY);
-  return token ? { Authorization: `Bearer ${token}` } : {};
+  return Object.fromEntries(buildVelocityHeaders(undefined, false).entries());
 }
 
 async function apiFetch<T>(path: string, options?: RequestInit): Promise<T> {
@@ -90,6 +90,23 @@ export async function fetchOpportunities(params?: {
   return res.data;
 }
 
+export async function updateOpportunity(body: {
+  opportunity_id: string;
+  stage?: string;
+  value?: number | null;
+  probability?: number | null;
+  expected_close_date?: string | null;
+  next_action?: string | null;
+  notes?: string | null;
+}): Promise<CrmOpportunityCard> {
+  const { opportunity_id, ...payload } = body;
+  const res = await apiFetch<{ status: string; data: CrmOpportunityCard }>(`/api/crm/opportunities/${opportunity_id}`, {
+    method: 'PATCH',
+    body: JSON.stringify(payload),
+  });
+  return res.data;
+}
+
 // ── Tasks ─────────────────────────────────────────────────────────────────────
 
 export async function fetchTasks(params?: {
@@ -121,6 +138,23 @@ export async function createTask(body: {
   return res.data;
 }
 
+export async function updateTask(body: {
+  reminder_id: string;
+  status: 'pending' | 'done' | 'snoozed' | 'cancelled';
+  due_at?: string;
+  notes?: string;
+}): Promise<CrmTask> {
+  const res = await apiFetch<{ status: string; data: CrmTask }>(`/api/crm/tasks/${body.reminder_id}`, {
+    method: 'PATCH',
+    body: JSON.stringify({
+      status: body.status,
+      due_at: body.due_at,
+      notes: body.notes,
+    }),
+  });
+  return res.data;
+}
+
 // ── Kanban ────────────────────────────────────────────────────────────────────
 
 export async function fetchKanbanBoard(): Promise<KanbanColumn[]> {
@@ -128,6 +162,21 @@ export async function fetchKanbanBoard(): Promise<KanbanColumn[]> {
   return res.data;
 }
 
+export async function updateLeadStage(body: {
+  lead_id: string;
+  status: string;
+  notes?: string;
+}): Promise<CrmLeadStageUpdate> {
+  const res = await apiFetch<{ status: string; data: CrmLeadStageUpdate }>(`/api/crm/leads/${body.lead_id}/stage`, {
+    method: 'PATCH',
+    body: JSON.stringify({
+      status: body.status,
+      notes: body.notes,
+    }),
+  });
+  return res.data;
+}
+
 // ── QD Scores ─────────────────────────────────────────────────────────────────
 
 export async function fetchQdScore(personId: string): Promise<{

app/src/lib/dreamWeaverApi.ts

@@ -0,0 +1,197 @@
+import { API_URL } from '@/lib/api';
+import { buildVelocityHeaders } from '@/lib/velocitySession';
+
+const rawDreamWeaverBase = import.meta.env.VITE_DREAM_WEAVER_URL?.trim();
+const rawDreamWeaverApiKey = import.meta.env.VITE_DREAM_WEAVER_API_KEY?.trim();
+const LOCAL_DREAM_WEAVER_GATEWAY = 'http://127.0.0.1:8082';
+
+export const DREAM_WEAVER_URL = (rawDreamWeaverBase && rawDreamWeaverBase.length > 0
+  ? rawDreamWeaverBase
+  : import.meta.env.DEV
+    ? LOCAL_DREAM_WEAVER_GATEWAY
+  : API_URL
+).replace(/\/$/, '');
+
+export interface DreamWeaverHealth {
+  online: boolean;
+  routeMounted: boolean;
+  status: string;
+  comfyuiOnline?: boolean;
+  comfyuiUrl?: string;
+  checkpointReady?: boolean;
+  checkpointCount?: number;
+  availableCheckpoints?: string[];
+  preferredCheckpoints?: string[];
+  detail?: string;
+}
+
+export interface DreamWeaverJobResponse {
+  job_id: string;
+  status?: string;
+  poll_url?: string;
+  result_url?: string;
+}
+
+export interface DreamWeaverStatusResponse {
+  status?: string;
+  ready?: boolean;
+  result_url?: string;
+  error?: string;
+}
+
+export interface SubmitDreamWeaverJobInput {
+  image: File;
+  roomType: string;
+  keywords: string;
+}
+
+function buildDreamWeaverHeaders(init?: HeadersInit): Headers {
+  const headers = buildVelocityHeaders(init, false);
+  if (rawDreamWeaverApiKey && !headers.has('X-Dream-Weaver-API-Key')) {
+    headers.set('X-Dream-Weaver-API-Key', rawDreamWeaverApiKey);
+  }
+  return headers;
+}
+
+function resolveDreamWeaverUrl(candidate: string | undefined, fallbackPath: string): string {
+  const path = candidate && candidate.trim().length > 0 ? candidate.trim() : fallbackPath;
+  if (/^https?:\/\//i.test(path)) {
+    return path;
+  }
+  return `${DREAM_WEAVER_URL}${path.startsWith('/') ? path : `/${path}`}`;
+}
+
+async function readErrorMessage(response: Response, fallback: string): Promise<string> {
+  const body = await response.json().catch(() => null) as { detail?: unknown; message?: unknown; error?: unknown } | null;
+  if (typeof body?.detail === 'string') return body.detail;
+  if (typeof body?.message === 'string') return body.message;
+  if (typeof body?.error === 'string') return body.error;
+  const text = await response.text().catch(() => '');
+  return text.trim() || fallback;
+}
+
+async function requestDreamWeaverJson<T>(url: string, init?: RequestInit): Promise<T> {
+  const response = await fetch(url, {
+    ...init,
+    headers: buildDreamWeaverHeaders(init?.headers),
+  });
+  if (!response.ok) {
+    throw new Error(await readErrorMessage(response, `Dream Weaver request failed: ${response.status}`));
+  }
+  return response.json() as Promise<T>;
+}
+
+export async function checkDreamWeaverHealth(): Promise<DreamWeaverHealth> {
+  let status = 'offline';
+  let detail: string | undefined;
+  let comfyuiOnline: boolean | undefined;
+  let comfyuiUrl: string | undefined;
+  let checkpointReady: boolean | undefined;
+  let checkpointCount: number | undefined;
+  let availableCheckpoints: string[] | undefined;
+  let preferredCheckpoints: string[] | undefined;
+  let healthOk = false;
+
+  try {
+    const response = await fetch(resolveDreamWeaverUrl(undefined, '/health'), {
+      headers: buildDreamWeaverHeaders(),
+    });
+    const body = await response.json().catch(() => null) as {
+      status?: unknown;
+      detail?: unknown;
+      comfyui?: unknown;
+      comfyui_url?: unknown;
+      comfyuiUrl?: unknown;
+      checkpoint_ready?: unknown;
+      checkpoint_count?: unknown;
+      available_checkpoints?: unknown;
+      preferred_checkpoints?: unknown;
+    } | null;
+    status = typeof body?.status === 'string' ? body.status : response.ok ? 'ok' : `HTTP ${response.status}`;
+    detail = typeof body?.detail === 'string' ? body.detail : undefined;
+    comfyuiOnline = typeof body?.comfyui === 'boolean' ? body.comfyui : undefined;
+    comfyuiUrl = typeof body?.comfyui_url === 'string'
+      ? body.comfyui_url
+      : typeof body?.comfyuiUrl === 'string'
+        ? body.comfyuiUrl
+        : undefined;
+    checkpointReady = typeof body?.checkpoint_ready === 'boolean' ? body.checkpoint_ready : undefined;
+    checkpointCount = typeof body?.checkpoint_count === 'number' ? body.checkpoint_count : undefined;
+    availableCheckpoints = Array.isArray(body?.available_checkpoints)
+      ? body.available_checkpoints.filter((item): item is string => typeof item === 'string')
+      : undefined;
+    preferredCheckpoints = Array.isArray(body?.preferred_checkpoints)
+      ? body.preferred_checkpoints.filter((item): item is string => typeof item === 'string')
+      : undefined;
+    healthOk = response.ok && ['ok', 'healthy', 'online'].includes(status.toLowerCase());
+  } catch (error) {
+    detail = error instanceof Error ? error.message : 'Unable to reach Dream Weaver gateway.';
+  }
+
+  try {
+    const probe = await fetch(resolveDreamWeaverUrl(undefined, '/dream-weaver/status/velocity-route-probe'), {
+      headers: buildDreamWeaverHeaders(),
+    });
+    if (probe.ok) {
+      return { online: healthOk, routeMounted: true, status, comfyuiOnline, comfyuiUrl, checkpointReady, checkpointCount, availableCheckpoints, preferredCheckpoints, detail };
+    }
+    const probeMessage = await readErrorMessage(probe, '');
+    const expectedMissingJob = probe.status === 404 && /job|not found|missing/i.test(probeMessage);
+    return {
+      online: healthOk && expectedMissingJob,
+      routeMounted: expectedMissingJob,
+      status,
+      comfyuiOnline,
+      comfyuiUrl,
+      checkpointReady,
+      checkpointCount,
+      availableCheckpoints,
+      preferredCheckpoints,
+      detail: detail ?? probeMessage,
+    };
+  } catch (error) {
+    return {
+      online: false,
+      routeMounted: false,
+      status,
+      comfyuiOnline,
+      comfyuiUrl,
+      checkpointReady,
+      checkpointCount,
+      availableCheckpoints,
+      preferredCheckpoints,
+      detail: error instanceof Error ? error.message : detail,
+    };
+  }
+}
+
+export async function submitDreamWeaverJob(input: SubmitDreamWeaverJobInput): Promise<DreamWeaverJobResponse> {
+  const formData = new FormData();
+  formData.append('image', input.image, input.image.name || 'room-source.jpg');
+  formData.append('room_type', input.roomType);
+  const trimmedKeywords = input.keywords.trim();
+  if (trimmedKeywords.length > 0) {
+    formData.append('keywords', trimmedKeywords);
+  }
+
+  return requestDreamWeaverJson<DreamWeaverJobResponse>(resolveDreamWeaverUrl(undefined, '/dream-weaver'), {
+    method: 'POST',
+    body: formData,
+  });
+}
+
+export async function getDreamWeaverStatus(job: Pick<DreamWeaverJobResponse, 'job_id' | 'poll_url'>): Promise<DreamWeaverStatusResponse> {
+  return requestDreamWeaverJson<DreamWeaverStatusResponse>(
+    resolveDreamWeaverUrl(job.poll_url, `/dream-weaver/status/${encodeURIComponent(job.job_id)}`),
+  );
+}
+
+export async function fetchDreamWeaverResult(jobId: string, resultUrl?: string): Promise<Blob> {
+  const response = await fetch(resolveDreamWeaverUrl(resultUrl, `/dream-weaver/result/${encodeURIComponent(jobId)}`), {
+    headers: buildDreamWeaverHeaders({ Accept: 'image/png,image/*,*/*' }),
+  });
+  if (!response.ok) {
+    throw new Error(await readErrorMessage(response, `Dream Weaver result failed: ${response.status}`));
+  }
+  return response.blob();
+}

app/src/lib/velocityPlatformClient.ts

@@ -1,10 +1,19 @@
 import { API_URL } from '@/lib/api';
-
-export const VELOCITY_TOKEN_KEY = 'velocity-api-token';
+import {
+  buildVelocityHeaders,
+  setVelocityToken,
+} from '@/lib/velocitySession';
+export {
+  VELOCITY_TOKEN_KEY,
+  clearVelocityToken,
+  getVelocityToken,
+  setVelocityToken,
+} from '@/lib/velocitySession';
 
 export interface VelocityUserProfile {
   user_id: string;
   role: string;
+  tenant_id?: string;
   full_name?: string | null;
   email?: string | null;
   avatar_url?: string | null;
@@ -13,6 +22,7 @@ export interface VelocityUserProfile {
 export interface VelocityActiveUser {
   user_id: string;
   role: string;
+  tenant_id?: string;
   full_name?: string | null;
   email?: string | null;
   avatar_url?: string | null;
@@ -148,18 +158,7 @@ export interface InventoryPropertySummary {
 }
 
 function buildHeaders(init?: HeadersInit, includeJson = true): Headers {
-  const headers = new Headers(init);
-  if (includeJson && !headers.has('Content-Type')) {
-    headers.set('Content-Type', 'application/json');
-  }
-  if (!headers.has('Accept')) {
-    headers.set('Accept', 'application/json');
-  }
-  const token = getVelocityToken();
-  if (token && !headers.has('Authorization')) {
-    headers.set('Authorization', `Bearer ${token}`);
-  }
-  return headers;
+  return buildVelocityHeaders(init, includeJson);
 }
 
 async function platformFetch<T>(path: string, init?: RequestInit): Promise<T> {
@@ -182,18 +181,6 @@ async function platformFetch<T>(path: string, init?: RequestInit): Promise<T> {
   return response.json() as Promise<T>;
 }
 
-export function setVelocityToken(token: string) {
-  localStorage.setItem(VELOCITY_TOKEN_KEY, token);
-}
-
-export function getVelocityToken(): string | null {
-  return localStorage.getItem(VELOCITY_TOKEN_KEY);
-}
-
-export function clearVelocityToken() {
-  localStorage.removeItem(VELOCITY_TOKEN_KEY);
-}
-
 export function normalizeVelocityRole(role: string | null | undefined): string {
   return (role ?? '').trim().toUpperCase();
 }

app/src/lib/velocitySession.ts

@@ -0,0 +1,37 @@
+export const VELOCITY_TOKEN_KEY = 'velocity-api-token';
+
+export function getVelocityToken(): string | null {
+  if (typeof window === 'undefined') {
+    return null;
+  }
+  return window.localStorage.getItem(VELOCITY_TOKEN_KEY);
+}
+
+export function setVelocityToken(token: string) {
+  if (typeof window === 'undefined') {
+    return;
+  }
+  window.localStorage.setItem(VELOCITY_TOKEN_KEY, token);
+}
+
+export function clearVelocityToken() {
+  if (typeof window === 'undefined') {
+    return;
+  }
+  window.localStorage.removeItem(VELOCITY_TOKEN_KEY);
+}
+
+export function buildVelocityHeaders(init?: HeadersInit, includeJson = true): Headers {
+  const headers = new Headers(init);
+  if (includeJson && !headers.has('Content-Type')) {
+    headers.set('Content-Type', 'application/json');
+  }
+  if (!headers.has('Accept')) {
+    headers.set('Accept', 'application/json');
+  }
+  const token = getVelocityToken();
+  if (token && !headers.has('Authorization')) {
+    headers.set('Authorization', `Bearer ${token}`);
+  }
+  return headers;
+}