chore: merge main into release for new releases

Author: Marfuen

apps/api/src/tasks/dto/task-responses.dto.ts

@@ -77,4 +77,12 @@ export class TaskResponseDto {
     example: '2024-01-15T10:30:00Z',
   })
   updatedAt: Date;
+
+  @ApiProperty({
+    description: 'Task template ID',
+    example: 'frk_tt_68406e353df3bc002994acef',
+    nullable: true,
+    required: false,
+  })
+  taskTemplateId?: string | null;
 }

apps/api/src/tasks/tasks.service.ts

@@ -29,6 +29,7 @@ export class TasksService {
         status: task.status,
         createdAt: task.createdAt,
         updatedAt: task.updatedAt,
+        taskTemplateId: task.taskTemplateId,
       }));
     } catch (error) {
       console.error('Error fetching tasks:', error);

apps/app/package.json

@@ -62,6 +62,7 @@
     "@vercel/sandbox": "^0.0.21",
     "@vercel/sdk": "^1.7.1",
     "ai": "^5.0.60",
+    "ai-elements": "^1.6.1",
     "axios": "^1.9.0",
     "better-auth": "^1.3.27",
     "botid": "^1.5.5",

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

@@ -258,7 +258,7 @@ export function EmptyState({ onBack, connectedProviders = [], onConnected }: Emp
   // AWS Step 2.5: Region Selection (after credential validation)
   if (step === 'validate-aws' && provider && selectedProvider === 'aws') {
     return (
-      <div className="container mx-auto flex min-h-[600px] w-full flex-col gap-6 p-4 md:p-6 lg:p-8">
+      <div className="mx-auto max-w-7xl flex min-h-[600px] w-full flex-col gap-6 py-4 md:py-6 lg:py-8">
         <div className="flex items-center gap-4">
           <Button variant="ghost" size="sm" onClick={() => setStep('connect')}>
             <ArrowLeft className="mr-2 h-4 w-4" />
@@ -413,7 +413,7 @@ export function EmptyState({ onBack, connectedProviders = [], onConnected }: Emp
     const fields = PROVIDER_FIELDS[provider.id];
 
     return (
-      <div className="container mx-auto flex min-h-[600px] w-full flex-col gap-6 p-4 md:p-6 lg:p-8">
+      <div className="mx-auto max-w-7xl flex min-h-[600px] w-full flex-col gap-6 py-4 md:py-6 lg:py-8">
         <div className="flex items-center gap-4">
           <Button variant="ghost" size="sm" onClick={handleBack}>
             <ArrowLeft className="mr-2 h-4 w-4" />

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

@@ -199,7 +199,7 @@ export function TestsLayout({
     const providerFindings = findingsByProvider[provider.integrationId] ?? [];
 
     return (
-      <div className="container mx-auto flex w-full flex-col gap-6 p-4 md:p-6 lg:p-8">
+      <div className="mx-auto max-w-7xl flex w-full flex-col gap-6 py-4 md:py-6 lg:py-8">
         <div className="flex items-center justify-between">
           <div className="space-y-1">
             <h1 className="text-2xl font-semibold tracking-tight">Cloud Security Tests</h1>

apps/app/src/app/(app)/[orgId]/components/ConditionalPaddingWrapper.tsx

@@ -0,0 +1,18 @@
+'use client';
+
+import { usePathname } from 'next/navigation';
+
+export function ConditionalPaddingWrapper({ children }: { children: React.ReactNode }) {
+  const pathname = usePathname();
+
+  // Don't add padding for automation pages, automation overview pages, and task detail pages
+  const isAutomationPage = pathname?.includes('/automation/');
+  const isAutomationOverviewPage = pathname?.includes('/automations/');
+  const isTaskDetailPage = pathname?.match(/\/tasks\/[^/]+$/) !== null; // Matches /tasks/[taskId] but not /tasks/[taskId]/automation
+
+  if (isAutomationPage || isAutomationOverviewPage || isTaskDetailPage) {
+    return <>{children}</>;
+  }
+
+  return <div className="px-4 sm:px-6 lg:px-8">{children}</div>;
+}