Merge branch 'main' into mariano/email-unsubscribe

Author: Marfuen

apps/app/src/app/(app)/[orgId]/security-questionnaire/[questionnaireId]/components/QuestionnaireDetailClient.tsx

@@ -64,17 +64,17 @@ export function QuestionnaireDetailClient({
         question: r.question,
         answer: r.answer,
         sources: r.sources,
-        failedToGenerate: (r as any).failedToGenerate ?? false,
-        status: (r as any).status ?? 'untouched',
-        _originalIndex: (r as any).originalIndex ?? index,
+        failedToGenerate: r.failedToGenerate ?? false,
+        status: r.status ?? 'untouched',
+        _originalIndex: r.originalIndex ?? index,
       }))}
       filteredResults={filteredResults?.map((r, index) => ({
         question: r.question,
         answer: r.answer,
         sources: r.sources,
-        failedToGenerate: (r as any).failedToGenerate ?? false,
-        status: (r as any).status ?? 'untouched',
-        _originalIndex: (r as any).originalIndex ?? index,
+        failedToGenerate: r.failedToGenerate ?? false,
+        status: r.status ?? 'untouched',
+        _originalIndex: r.originalIndex ?? index,
       }))}
       searchQuery={searchQuery}
       setSearchQuery={setSearchQuery}

apps/app/src/app/(app)/[orgId]/security-questionnaire/actions/vendor-questionnaire-orchestrator.ts

@@ -1,15 +1,19 @@
 'use server';
 
 import { authActionClient } from '@/actions/safe-action';
-import { vendorQuestionnaireOrchestratorTask } from '@/jobs/tasks/vendors/vendor-questionnaire-orchestrator';
-import { tasks } from '@trigger.dev/sdk';
+import { answerQuestion } from '@/jobs/tasks/vendors/answer-question';
+import { syncOrganizationEmbeddings } from '@/lib/vector';
+import { logger } from '@/utils/logger';
+import { headers } from 'next/headers';
+import { revalidatePath } from 'next/cache';
 import { z } from 'zod';
 
 const inputSchema = z.object({
   questionsAndAnswers: z.array(
     z.object({
       question: z.string(),
       answer: z.string().nullable(),
+      _originalIndex: z.number().optional(), // Preserves original index from QuestionnaireResult
     }),
   ),
 });
@@ -34,26 +38,99 @@ export const vendorQuestionnaireOrchestrator = authActionClient
     const organizationId = session.activeOrganizationId;
 
     try {
-      // Trigger the root orchestrator task - it will handle batching internally
-      const handle = await tasks.trigger<typeof vendorQuestionnaireOrchestratorTask>(
-        'vendor-questionnaire-orchestrator',
-        {
-          vendorId: `org_${organizationId}`,
+      logger.info('Starting auto-answer questionnaire', {
+        organizationId,
+        questionCount: questionsAndAnswers.length,
+      });
+
+      // Sync organization embeddings before generating answers
+      // Uses incremental sync: only updates what changed (much faster than full sync)
+      try {
+        await syncOrganizationEmbeddings(organizationId);
+        logger.info('Organization embeddings synced successfully', {
           organizationId,
-          questionsAndAnswers,
-        },
+        });
+      } catch (error) {
+        logger.warn('Failed to sync organization embeddings', {
+          organizationId,
+          error: error instanceof Error ? error.message : 'Unknown error',
+        });
+        // Continue with existing embeddings if sync fails
+      }
+
+      // Filter questions that need answers (skip already answered)
+      // Preserve original index if provided (for single question answers)
+      const questionsToAnswer = questionsAndAnswers
+        .map((qa, index) => ({
+          ...qa,
+          index: qa._originalIndex !== undefined ? qa._originalIndex : index,
+        }))
+        .filter((qa) => !qa.answer || qa.answer.trim().length === 0);
+
+      logger.info('Questions to answer', {
+        total: questionsAndAnswers.length,
+        toAnswer: questionsToAnswer.length,
+      });
+
+      // Process all questions in parallel by calling answerQuestion directly
+      // Note: metadata updates are disabled since we're not in a Trigger.dev task context
+      const results = await Promise.all(
+        questionsToAnswer.map((qa) =>
+          answerQuestion(
+            {
+              question: qa.question,
+              organizationId,
+              questionIndex: qa.index,
+              totalQuestions: questionsAndAnswers.length,
+            },
+            { useMetadata: false },
+          ),
+        ),
       );
 
+      // Process results
+      const allAnswers: Array<{
+        questionIndex: number;
+        question: string;
+        answer: string | null;
+        sources?: Array<{
+          sourceType: string;
+          sourceName?: string;
+          score: number;
+        }>;
+      }> = results.map((result) => ({
+        questionIndex: result.questionIndex,
+        question: result.question,
+        answer: result.answer,
+        sources: result.sources,
+      }));
+
+      logger.info('Auto-answer questionnaire completed', {
+        organizationId,
+        totalQuestions: questionsAndAnswers.length,
+        answered: allAnswers.filter((a) => a.answer).length,
+      });
+
+      // Revalidate the page to show updated answers
+      const headersList = await headers();
+      let path = headersList.get('x-pathname') || headersList.get('referer') || '';
+      path = path.replace(/\/[a-z]{2}\//, '/');
+      revalidatePath(path);
+
       return {
         success: true,
         data: {
-          taskId: handle.id, // Return orchestrator task ID for polling
+          answers: allAnswers,
         },
       };
     } catch (error) {
+      logger.error('Failed to answer questions', {
+        organizationId,
+        error: error instanceof Error ? error.message : 'Unknown error',
+      });
       throw error instanceof Error
         ? error
-        : new Error('Failed to trigger vendor questionnaire orchestrator');
+        : new Error('Failed to answer questions');
     }
   });
 

apps/app/src/app/(app)/[orgId]/security-questionnaire/components/QuestionnaireResultsCards.tsx

@@ -56,8 +56,8 @@ export function QuestionnaireResultsCards({
     <div className="lg:hidden space-y-4">
       {filteredResults.map((qa, index) => {
         // Use originalIndex if available (from detail page), otherwise find by question text
-        const originalIndex = (qa as any)._originalIndex !== undefined 
-          ? (qa as any)._originalIndex 
+        const originalIndex = qa._originalIndex !== undefined 
+          ? qa._originalIndex 
           : results.findIndex((r) => r.question === qa.question);
         // Fallback to index if not found (shouldn't happen, but safety check)
         const safeIndex = originalIndex >= 0 ? originalIndex : index;

apps/app/src/app/(app)/[orgId]/security-questionnaire/components/QuestionnaireResultsTable.tsx

@@ -66,8 +66,8 @@ export function QuestionnaireResultsTable({
         <TableBody>
           {filteredResults.map((qa, index) => {
             // Use originalIndex if available (from detail page), otherwise find by question text
-            const originalIndex = (qa as any)._originalIndex !== undefined 
-              ? (qa as any)._originalIndex 
+            const originalIndex = qa._originalIndex !== undefined 
+              ? qa._originalIndex 
               : results.findIndex((r) => r.question === qa.question);
             // Fallback to index if not found (shouldn't happen, but safety check)
             const safeIndex = originalIndex >= 0 ? originalIndex : index;

apps/app/src/app/(app)/[orgId]/security-questionnaire/components/types.ts

@@ -11,5 +11,8 @@ export interface QuestionAnswer {
   }>;
   failedToGenerate?: boolean; // Track if auto-generation was attempted but failed
   status?: 'untouched' | 'generated' | 'manual'; // Track answer source: untouched, AI-generated, or manually edited
+  // Optional field used when converting QuestionnaireResult to QuestionAnswer for orchestrator
+  // Preserves the original index from QuestionnaireResult.originalIndex
+  _originalIndex?: number;
 }