Merge branch 'main' into ehco/call-recording-converge-on-meeting-start

Author: ehconitin

package.json

@@ -74,6 +74,7 @@
       "packages/twenty-utils",
       "packages/twenty-zapier",
       "packages/twenty-website",
+      "packages/twenty-website-redone",
       "packages/twenty-docs",
       "packages/twenty-e2e-testing",
       "packages/twenty-shared",

packages/twenty-apps/internal/twenty-meeting-bot/src/logic-functions/domain/build-pending-transcript-marker.util.ts

@@ -0,0 +1,13 @@
+import { type TranscriptMarker } from 'src/logic-functions/types/transcript-marker.type';
+
+export const buildPendingTranscriptMarker = ({
+  recallTranscriptId,
+  requestedAt,
+}: {
+  recallTranscriptId: string;
+  requestedAt: string;
+}): TranscriptMarker => ({
+  recallTranscriptId,
+  status: 'PENDING',
+  requestedAt,
+});

packages/twenty-apps/internal/twenty-meeting-bot/src/logic-functions/flows/__tests__/converge-diverged-call-recordings.test.ts

@@ -163,15 +163,15 @@ describe('convergeDivergedCallRecordings', () => {
       callRecordingId: 'call-recording-1',
     });
     expect(client.mutations).toEqual([
-      {
+      expect.objectContaining({
         id: 'call-recording-1',
-        data: {
+        data: expect.objectContaining({
           status: 'PROCESSING',
           startedAt: '2026-06-09T13:02:00.000Z',
           endedAt: '2026-06-09T14:00:00.000Z',
           externalRecordingId: 'recall-recording-1',
-        },
-      },
+        }),
+      }),
     ]);
     expect(chargeCompletedCallRecordingMock).not.toHaveBeenCalled();
     expect(result).toEqual({
@@ -470,6 +470,11 @@ describe('convergeDivergedCallRecordings', () => {
         id: 'call-recording-1',
         data: {
           endedAt: '2026-06-09T14:00:00.000Z',
+          transcript: {
+            recallTranscriptId: 'recall-transcript-1',
+            status: 'PENDING',
+            requestedAt: NOW.toISOString(),
+          },
         },
       },
     ]);

packages/twenty-apps/internal/twenty-meeting-bot/src/logic-functions/flows/__tests__/handle-recall-webhook.test.ts

@@ -750,25 +750,17 @@ describe('handleRecallWebhook', () => {
           status: 'PROCESSING',
           externalBotId: 'recall-bot-1',
           externalRecordingId: 'recall-recording-1',
+          transcript: {
+            recallTranscriptId: 'recall-transcript-1',
+            status: 'PENDING',
+            requestedAt: expect.any(String),
+          },
         },
       },
     ]);
   });
 
-  it('does not re-request a transcript on a redelivered done event', async () => {
-    listRecallTranscriptsMock.mockResolvedValue({
-      ok: true,
-      transcripts: [
-        {
-          id: 'recall-transcript-1',
-          createdAt: '2026-01-01T14:06:00.000Z',
-          downloadUrl: undefined,
-          provider: 'recallai_async',
-          statusCode: 'processing',
-          statusSubCode: undefined,
-        },
-      ],
-    });
+  it('does not re-request a transcript on a redelivered done event while Recall list is stale', async () => {
     const client = new FakeCoreApiClient([
       {
         id: 'call-recording-1',
@@ -800,6 +792,9 @@ describe('handleRecallWebhook', () => {
     expect(listRecallTranscriptsMock).toHaveBeenCalledWith({
       externalRecordingId: 'recall-recording-1',
     });
+    expect(retrieveRecallTranscriptMock).toHaveBeenCalledWith({
+      transcriptId: 'recall-transcript-1',
+    });
     expect(client.mutations).toEqual([
       {
         id: 'call-recording-1',
@@ -858,14 +853,14 @@ describe('handleRecallWebhook', () => {
       callRecordingId: 'call-recording-1',
     });
     expect(client.mutations).toEqual([
-      {
+      expect.objectContaining({
         id: 'call-recording-1',
-        data: {
+        data: expect.objectContaining({
           status: 'PROCESSING',
           externalBotId: 'recall-bot-1',
           externalRecordingId: 'recall-recording-9',
-        },
-      },
+        }),
+      }),
     ]);
   });
 
@@ -972,15 +967,15 @@ describe('handleRecallWebhook', () => {
       callRecordingId: 'call-recording-1',
     });
     expect(client.mutations).toEqual([
-      {
+      expect.objectContaining({
         id: 'call-recording-1',
-        data: {
+        data: expect.objectContaining({
           status: 'PROCESSING',
           externalBotId: 'recall-bot-1',
           externalRecordingId: 'recall-recording-1',
           audio: [{ fileId: 'file-audio-1', label: 'audio.mp3' }],
-        },
-      },
+        }),
+      }),
     ]);
     expect(chargeCompletedCallRecordingMock).not.toHaveBeenCalled();
   });

packages/twenty-apps/internal/twenty-meeting-bot/src/logic-functions/flows/converge-diverged-call-recordings-result.type.ts

@@ -0,0 +1,8 @@
+export type ConvergeDivergedCallRecordingsResult = {
+  candidateCount: number;
+  updatedCallRecordingIds: string[];
+  markedFailedCallRecordingIds: string[];
+  requestedTranscriptCallRecordingIds: string[];
+  unconvergeableCallRecordingIds: string[];
+  skippedNotStartedCallRecordingIds: string[];
+};

packages/twenty-apps/internal/twenty-meeting-bot/src/logic-functions/flows/converge-diverged-call-recordings.util.ts

@@ -19,6 +19,7 @@ import { isCallRecordingStatusDowngrade } from 'src/logic-functions/domain/is-ca
 import { isNonEmptyString } from 'src/logic-functions/utils/is-non-empty-string.util';
 import { persistCallRecordingProgress } from 'src/logic-functions/flows/persist-call-recording-progress.util';
 import { reconcileCallRecordingTranscriptArtifact } from 'src/logic-functions/flows/reconcile-call-recording-transcript-artifact.util';
+import { type ConvergeDivergedCallRecordingsResult } from 'src/logic-functions/flows/converge-diverged-call-recordings-result.type';
 import { shouldCompleteCallRecordingIngestion } from 'src/logic-functions/domain/should-complete-call-recording-ingestion.util';
 import {
   updateCallRecording,
@@ -63,15 +64,6 @@ type DivergedCallRecordingNode = {
   calendarEvent?: { startsAt?: string | null; endsAt?: string | null } | null;
 };
 
-export type ConvergeDivergedCallRecordingsResult = {
-  candidateCount: number;
-  updatedCallRecordingIds: string[];
-  markedFailedCallRecordingIds: string[];
-  requestedTranscriptCallRecordingIds: string[];
-  unconvergeableCallRecordingIds: string[];
-  skippedNotStartedCallRecordingIds: string[];
-};
-
 // Webhook deliveries get lost; this pull pass re-derives state from Recall.
 export const convergeDivergedCallRecordings = async ({
   client,
@@ -119,6 +111,7 @@ export const convergeDivergedCallRecordings = async ({
       client,
       candidate,
       externalBotId: candidate.externalBotId,
+      now,
       result,
     });
   }
@@ -229,11 +222,13 @@ const convergeCallRecording = async ({
   client,
   candidate,
   externalBotId,
+  now,
   result,
 }: {
   client: CoreApiClient;
   candidate: DivergedCallRecordingCandidate;
   externalBotId: string;
+  now: Date;
   result: ConvergeDivergedCallRecordingsResult;
 }): Promise<void> => {
   const botResult = await getRecallBot({ externalBotId });
@@ -269,6 +264,7 @@ const convergeCallRecording = async ({
         callRecordingId: candidate.id,
         currentStatus: candidate.status,
         externalRecordingId,
+        requestedAt: now.toISOString(),
         transcript: candidate.transcript,
       });
 

packages/twenty-apps/internal/twenty-meeting-bot/src/logic-functions/flows/handle-recall-webhook.util.ts

@@ -353,6 +353,7 @@ const buildTranscriptArtifactUpdate = async ({
       callRecordingId: callRecording.id,
       currentStatus: callRecording.status,
       externalRecordingId,
+      requestedAt: new Date().toISOString(),
       transcript: callRecording.transcript,
     });
 

packages/twenty-apps/internal/twenty-meeting-bot/src/logic-functions/flows/reconcile-call-recording-transcript-artifact-result.type.ts

@@ -0,0 +1,11 @@
+import { type CallRecordingUpdateFields } from 'src/logic-functions/data/update-call-recording.util';
+
+type CallRecordingTranscriptArtifactUpdateFields = Pick<
+  CallRecordingUpdateFields,
+  'status' | 'transcript'
+>;
+
+export type ReconcileCallRecordingTranscriptArtifactResult = {
+  updateData: CallRecordingTranscriptArtifactUpdateFields;
+  requestedTranscript: boolean;
+};

packages/twenty-apps/internal/twenty-meeting-bot/src/logic-functions/flows/reconcile-call-recording-transcript-artifact.util.ts

@@ -1,36 +1,32 @@
 import { isNull, isUndefined } from '@sniptt/guards';
 
 import { CallRecordingStatus } from 'src/logic-functions/constants/call-recording-status';
-import { type CallRecordingUpdateFields } from 'src/logic-functions/data/update-call-recording.util';
 import { buildFailedTranscriptMarker } from 'src/logic-functions/domain/build-failed-transcript-marker.util';
+import { buildPendingTranscriptMarker } from 'src/logic-functions/domain/build-pending-transcript-marker.util';
 import { isCallRecordingStatusDowngrade } from 'src/logic-functions/domain/is-call-recording-status-downgrade.util';
 import { parseTranscriptMarker } from 'src/logic-functions/domain/parse-transcript-marker.util';
 import { createAsyncRecallTranscript } from 'src/logic-functions/recall-api/create-async-recall-transcript.util';
 import {
   listRecallTranscripts,
-  type RecallTranscriptSummary,
 } from 'src/logic-functions/recall-api/list-recall-transcripts.util';
+import { type RecallTranscriptSummary } from 'src/logic-functions/recall-api/recall-transcript-summary.type';
 import { downloadTranscript } from 'src/logic-functions/flows/download-transcript.util';
+import { type ReconcileCallRecordingTranscriptArtifactResult } from 'src/logic-functions/flows/reconcile-call-recording-transcript-artifact-result.type';
 
-type CallRecordingTranscriptArtifactUpdateFields = Pick<
-  CallRecordingUpdateFields,
-  'status' | 'transcript'
->;
-
-export type ReconcileCallRecordingTranscriptArtifactResult = {
-  updateData: CallRecordingTranscriptArtifactUpdateFields;
-  requestedTranscript: boolean;
-};
+type CallRecordingTranscriptArtifactUpdateFields =
+  ReconcileCallRecordingTranscriptArtifactResult['updateData'];
 
 export const reconcileCallRecordingTranscriptArtifact = async ({
   callRecordingId,
   currentStatus,
   externalRecordingId,
+  requestedAt,
   transcript,
 }: {
   callRecordingId: string;
   currentStatus: string | undefined;
   externalRecordingId: string;
+  requestedAt: string;
   transcript: unknown;
 }): Promise<ReconcileCallRecordingTranscriptArtifactResult> => {
   const existingTranscriptMarker = parseTranscriptMarker(transcript);
@@ -60,8 +56,17 @@ export const reconcileCallRecordingTranscriptArtifact = async ({
   const transcriptArtifact = selectRecallTranscriptArtifact(
     listResult.transcripts,
   );
+  const pendingTranscriptMarkerRecallTranscriptId =
+    existingTranscriptMarker?.status === 'PENDING'
+      ? (existingTranscriptMarker.recallTranscriptId ?? undefined)
+      : undefined;
+  const transcriptIdToDownload =
+    transcriptArtifact?.id ?? pendingTranscriptMarkerRecallTranscriptId;
 
-  if (isUndefined(transcriptArtifact)) {
+  if (
+    isUndefined(transcriptArtifact) &&
+    isUndefined(pendingTranscriptMarkerRecallTranscriptId)
+  ) {
     const createResult = await createAsyncRecallTranscript({
       externalRecordingId,
       callRecordingId,
@@ -75,12 +80,21 @@ export const reconcileCallRecordingTranscriptArtifact = async ({
       return buildEmptyTranscriptArtifactResult();
     }
 
-    return { updateData: {}, requestedTranscript: true };
+    return {
+      updateData: {
+        transcript: buildPendingTranscriptMarker({
+          recallTranscriptId: createResult.transcriptId,
+          requestedAt,
+        }),
+      },
+      requestedTranscript: true,
+    };
   }
 
   if (
-    transcriptArtifact.statusCode === 'failed' ||
-    transcriptArtifact.statusCode === 'error'
+    !isUndefined(transcriptArtifact) &&
+    (transcriptArtifact.statusCode === 'failed' ||
+      transcriptArtifact.statusCode === 'error')
   ) {
     return {
       updateData: buildTranscriptFailureUpdate({
@@ -92,12 +106,19 @@ export const reconcileCallRecordingTranscriptArtifact = async ({
     };
   }
 
-  if (transcriptArtifact.statusCode !== 'done') {
+  if (
+    !isUndefined(transcriptArtifact) &&
+    transcriptArtifact.statusCode !== 'done'
+  ) {
+    return buildEmptyTranscriptArtifactResult();
+  }
+
+  if (isUndefined(transcriptIdToDownload)) {
     return buildEmptyTranscriptArtifactResult();
   }
 
   const downloadResult = await downloadTranscript({
-    transcriptId: transcriptArtifact.id,
+    transcriptId: transcriptIdToDownload,
   });
 
   if (downloadResult.outcome === 'filled') {
@@ -113,7 +134,7 @@ export const reconcileCallRecordingTranscriptArtifact = async ({
     return {
       updateData: buildTranscriptFailureUpdate({
         currentStatus,
-        transcriptId: transcriptArtifact.id,
+        transcriptId: transcriptIdToDownload,
         subCode: downloadResult.subCode,
       }),
       requestedTranscript: false,

packages/twenty-apps/internal/twenty-meeting-bot/src/logic-functions/recall-api/list-recall-transcripts.util.ts

@@ -5,15 +5,7 @@ import { asRecord } from 'src/logic-functions/utils/as-record.util';
 import { getString } from 'src/logic-functions/utils/get-string.util';
 import { getRecallApiConfig } from 'src/logic-functions/recall-api/get-recall-api-config.util';
 import { recallBotApiRequest } from 'src/logic-functions/recall-api/recall-bot-api-request.util';
-
-export type RecallTranscriptSummary = {
-  id: string;
-  createdAt: string | undefined;
-  downloadUrl: string | undefined;
-  provider: string | undefined;
-  statusCode: string | undefined;
-  statusSubCode: string | undefined;
-};
+import { type RecallTranscriptSummary } from 'src/logic-functions/recall-api/recall-transcript-summary.type';
 
 type ListRecallTranscriptsResult =
   | { ok: true; transcripts: RecallTranscriptSummary[] }