merge: hardening/apr-week2 → master (v0.13-ai-coaching)

AI coaching pipeline + sidecar hardening.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

src/caller/caller-context.service.ts

@@ -89,8 +89,8 @@ export class CallerContextService {
 
     private async build(leadId: string, patientId: string, auth: string): Promise<CallerContext | null> {
         try {
-            // Step 1: Fetch lead first to get the authoritative patientId
+            const [leadData, appointmentsData, callsData, activitiesData] = await Promise.all([
-            const leadData = await this.platform.queryWithAuth<any>(
+                this.platform.queryWithAuth<any>(
                     `{ lead(filter: { id: { eq: "${leadId}" } }) {
                         id contactName { firstName lastName }
                         contactPhone { primaryPhoneNumber }
@@ -99,24 +99,9 @@ export class CallerContextService {
                         utmCampaign patientId
                     } }`,
                     undefined, auth,
-            );
+                ),
-
+                patientId ? this.platform.queryWithAuth<any>(
-            const lead = leadData?.lead;
+                    `{ appointments(first: 10, filter: { patientId: { eq: "${patientId}" } }, orderBy: [{ scheduledAt: DescNullsLast }]) { edges { node {
-            if (!lead) return null;
-
-            // Use Lead's patientId as authoritative source — the input
-            // param may be empty if caller resolution just linked them.
-            const resolvedPatientId = patientId || lead.patientId || '';
-            this.logger.log(`[CALLER-CTX] Resolved patientId=${resolvedPatientId} (input=${patientId}, lead=${lead.patientId ?? '∅'})`);
-
-            const firstName = lead.contactName?.firstName ?? '';
-            const lastName = lead.contactName?.lastName ?? '';
-
-            // Step 2: Fetch appointments, calls, activities in parallel
-            // using the resolved patientId from the Lead record.
-            const [appointmentsData, callsData, activitiesData] = await Promise.all([
-                resolvedPatientId ? this.platform.queryWithAuth<any>(
-                    `{ appointments(first: 10, filter: { patientId: { eq: "${resolvedPatientId}" } }, orderBy: [{ scheduledAt: DescNullsLast }]) { edges { node {
                         scheduledAt status doctorName department reasonForVisit
                     } } } }`,
                     undefined, auth,
@@ -135,6 +120,12 @@ export class CallerContextService {
                 ),
             ]);
 
+            const lead = leadData?.lead;
+            if (!lead) return null;
+
+            const firstName = lead.contactName?.firstName ?? '';
+            const lastName = lead.contactName?.lastName ?? '';
+
             const appointments = (appointmentsData?.appointments?.edges ?? []).map((e: any) => e.node);
             const calls = (callsData?.calls?.edges ?? []).map((e: any) => ({
                 startedAt: e.node.startedAt,
@@ -157,7 +148,7 @@ export class CallerContextService {
 
             return {
                 leadId,
-                patientId: resolvedPatientId,
+                patientId: patientId || lead.patientId || '',
                 name: `${firstName} ${lastName}`.trim() || 'Unknown',
                 phone: lead.contactPhone?.primaryPhoneNumber ?? '',
                 isNew: false,