Merge branch 'main' of https://github.com/trycompai/comp into chas/mbm-policy

Author: chasprowebdev

apps/app/src/app/(app)/[orgId]/cloud-tests/actions/connect-cloud.ts

@@ -4,7 +4,7 @@ import { encrypt } from '@/lib/encryption';
 import { getIntegrationHandler } from '@comp/integrations';
 import { db } from '@db';
 import { revalidatePath } from 'next/cache';
-import { headers } from 'next/headers';
+import { cookies, headers } from 'next/headers';
 import { z } from 'zod';
 import { authActionClient } from '../../../../../actions/safe-action';
 import { runTests } from './run-tests';
@@ -100,7 +100,11 @@ export const connectCloudAction = authActionClient
       }
 
       // Trigger immediate scan
-      await runTests();
+      const runResult = await runTests();
+
+      if (runResult.success && runResult.publicAccessToken) {
+        (await cookies()).set('publicAccessToken', runResult.publicAccessToken);
+      }
 
       // Revalidate the path
       const headersList = await headers();
@@ -110,6 +114,13 @@ export const connectCloudAction = authActionClient
 
       return {
         success: true,
+        trigger: runResult.success
+          ? {
+              taskId: runResult.taskId ?? undefined,
+              publicAccessToken: runResult.publicAccessToken ?? undefined,
+            }
+          : undefined,
+        runErrors: runResult.success ? undefined : (runResult.errors ?? undefined),
       };
     } catch (error) {
       console.error('Failed to connect cloud provider:', error);

apps/app/src/app/(app)/[orgId]/cloud-tests/components/CloudConnectionCard.tsx

@@ -18,6 +18,11 @@ interface CloudField {
   type?: string;
 }
 
+type TriggerInfo = {
+  taskId?: string;
+  publicAccessToken?: string;
+};
+
 interface CloudConnectionCardProps {
   cloudProvider: 'aws' | 'gcp' | 'azure';
   name: string;
@@ -27,7 +32,7 @@ interface CloudConnectionCardProps {
   guideUrl?: string;
   color?: string;
   logoUrl?: string;
-  onSuccess?: () => void;
+  onSuccess?: (trigger?: TriggerInfo) => void;
 }
 
 export function CloudConnectionCard({
@@ -83,7 +88,11 @@ export function CloudConnectionCard({
       if (result?.data?.success) {
         toast.success(`${name} connected! Running initial scan...`);
         setCredentials({});
-        onSuccess?.();
+        onSuccess?.(result.data?.trigger);
+
+        if (result.data?.runErrors && result.data.runErrors.length > 0) {
+          toast.error(result.data.runErrors[0] || 'Initial scan reported an issue');
+        }
       } else {
         toast.error(result?.data?.error || 'Failed to connect');
       }
@@ -99,13 +108,11 @@ export function CloudConnectionCard({
     <Card className="rounded-xs">
       <CardHeader className="space-y-4">
         <div className="flex items-center gap-3">
-          <div className={`bg-gradient-to-br ${color} flex items-center justify-center rounded-lg p-2`}>
+          <div
+            className={`bg-gradient-to-br ${color} flex items-center justify-center rounded-lg p-2`}
+          >
             {logoUrl && (
-              <img
-                src={logoUrl}
-                alt={`${shortName} logo`}
-                className="h-8 w-8 object-contain"
-              />
+              <img src={logoUrl} alt={`${shortName} logo`} className="h-8 w-8 object-contain" />
             )}
           </div>
           <div>

apps/app/src/app/(app)/[orgId]/cloud-tests/components/EmptyState.tsx

@@ -117,12 +117,18 @@ const PROVIDER_FIELDS: Record<'aws' | 'gcp' | 'azure', ProviderFieldWithOptions[
   ],
 };
 
+type TriggerInfo = {
+  taskId?: string;
+  publicAccessToken?: string;
+};
+
 interface EmptyStateProps {
   onBack?: () => void;
   connectedProviders?: string[];
+  onConnected?: (trigger?: TriggerInfo) => void;
 }
 
-export function EmptyState({ onBack, connectedProviders = [] }: EmptyStateProps = {}) {
+export function EmptyState({ onBack, connectedProviders = [], onConnected }: EmptyStateProps = {}) {
   const [step, setStep] = useState<Step>('choose');
   const [selectedProvider, setSelectedProvider] = useState<CloudProvider>(null);
   const [credentials, setCredentials] = useState<Record<string, string>>({});
@@ -224,6 +230,12 @@ export function EmptyState({ onBack, connectedProviders = [] }: EmptyStateProps
 
       if (result?.data?.success) {
         setStep('success');
+        if (result.data?.trigger) {
+          onConnected?.(result.data.trigger);
+        }
+        if (result.data?.runErrors && result.data.runErrors.length > 0) {
+          toast.error(result.data.runErrors[0] || 'Initial scan reported an issue');
+        }
         // If user already has clouds, automatically return to results after 2 seconds
         if (onBack) {
           setTimeout(() => {

apps/app/src/app/(app)/[orgId]/cloud-tests/components/ResultsView.tsx

@@ -3,8 +3,9 @@
 import { Button } from '@comp/ui/button';
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@comp/ui/select';
 import { useRealtimeRun } from '@trigger.dev/react-hooks';
-import { CheckCircle2, Info, Loader2, RefreshCw, X } from 'lucide-react';
+import { AlertTriangle, CheckCircle2, Info, Loader2, RefreshCw, X } from 'lucide-react';
 import { useEffect, useState } from 'react';
+import type { IntegrationRunOutput } from '../types';
 import { FindingsTable } from './FindingsTable';
 
 interface Finding {
@@ -23,6 +24,7 @@ interface ResultsViewProps {
   scanAccessToken: string | null;
   onRunScan: () => Promise<string | null>;
   isScanning: boolean;
+  runOutput: IntegrationRunOutput | null;
 }
 
 const severityOrder = { critical: 0, high: 1, medium: 2, low: 3, info: 4 };
@@ -50,6 +52,7 @@ export function ResultsView({
   scanAccessToken,
   onRunScan,
   isScanning,
+  runOutput,
 }: ResultsViewProps) {
   // Track scan status with Trigger.dev hooks
   const { run } = useRealtimeRun(scanTaskId || '', {
@@ -64,17 +67,28 @@ export function ResultsView({
   const [selectedSeverity, setSelectedSeverity] = useState<string>('all');
   const [showSuccessBanner, setShowSuccessBanner] = useState(false);
   const [showErrorBanner, setShowErrorBanner] = useState(false);
+  const [showOutputErrorBanner, setShowOutputErrorBanner] = useState(false);
 
-  // Show success banner when scan completes, auto-hide after 5 seconds
+  const runOutputError = runOutput && !runOutput.success ? runOutput : null;
+  const scanSucceeded = scanCompleted && !runOutputError;
+  const outputErrorMessages =
+    runOutputError?.errors && runOutputError.errors.length > 0
+      ? runOutputError.errors
+      : runOutputError?.failedIntegrations?.map(
+          (integration) => `${integration.name}: ${integration.error}`,
+        ) ?? [];
+
+  // Show success banner when scan completes successfully, auto-hide after 5 seconds
   useEffect(() => {
-    if (scanCompleted) {
+    if (scanSucceeded) {
       setShowSuccessBanner(true);
       const timer = setTimeout(() => {
         setShowSuccessBanner(false);
       }, 5000);
       return () => clearTimeout(timer);
     }
-  }, [scanCompleted]);
+    setShowSuccessBanner(false);
+  }, [scanSucceeded]);
 
   // Auto-dismiss error banner after 30 seconds
   useEffect(() => {
@@ -87,6 +101,16 @@ export function ResultsView({
     }
   }, [scanFailed]);
 
+  // Show output error banner when run completes with errors
+  useEffect(() => {
+    if (runOutputError) {
+      setShowOutputErrorBanner(true);
+      setShowSuccessBanner(false);
+    } else {
+      setShowOutputErrorBanner(false);
+    }
+  }, [runOutputError]);
+
   // Get unique statuses and severities
   const uniqueStatuses = Array.from(
     new Set(findings.map((f) => f.status).filter(Boolean) as string[]),
@@ -146,8 +170,40 @@ export function ResultsView({
         </div>
       )}
 
+      {/* Output error banner when run reports errors but job didn't crash */}
+      {showOutputErrorBanner && runOutputError && !isScanning && (
+        <div className="bg-destructive/10 flex items-start gap-3 rounded-lg border border-destructive/20 p-4">
+          <AlertTriangle className="text-destructive h-5 w-5 flex-shrink-0" />
+          <div className="flex-1 space-y-1">
+            <p className="text-destructive text-sm font-medium">Scan completed with errors</p>
+            <ul className="text-muted-foreground text-xs leading-relaxed">
+              {outputErrorMessages.slice(0, 5).map((message, index) => (
+                <li key={`${message}-${index}`}>• {message}</li>
+              ))}
+              {outputErrorMessages.length === 0 && (
+                <li>Encountered an unknown error while processing integration results.</li>
+              )}
+            </ul>
+            {runOutputError.failedIntegrations && runOutputError.failedIntegrations.length > 0 && (
+              <p className="text-muted-foreground text-xs">
+                {runOutputError.failedIntegrations.length} integration
+                {runOutputError.failedIntegrations.length === 1 ? '' : 's'} returned errors.
+              </p>
+            )}
+          </div>
+          <Button
+            variant="ghost"
+            size="sm"
+            onClick={() => setShowOutputErrorBanner(false)}
+            className="text-muted-foreground hover:text-foreground h-auto p-1"
+          >
+            <X className="h-4 w-4" />
+          </Button>
+        </div>
+      )}
+
       {/* Propagation delay info banner - only when scan succeeds but returns empty output */}
-      {scanCompleted && findings.length === 0 && !isScanning && !scanFailed && (
+      {scanCompleted && findings.length === 0 && !isScanning && !scanFailed && !runOutputError && (
         <div className="bg-blue-50 dark:bg-blue-950/20 flex items-center gap-3 rounded-lg border border-blue-200 dark:border-blue-900 p-4">
           <Info className="text-blue-600 dark:text-blue-400 h-5 w-5 flex-shrink-0" />
           <div className="flex-1">