From e8e319f1e82074c12841c6bc1275108c7eda4a60 Mon Sep 17 00:00:00 2001
From: "mintlify[bot]" <109931778+mintlify[bot]@users.noreply.github.com>
Date: Mon, 27 Oct 2025 12:22:43 -0400
Subject: [PATCH 1/4] Automated Evidence Demo Video (#1691)

* Documentation edits made through Mintlify web editor

* Documentation edits made through Mintlify web editor

---------

Co-authored-by: mintlify[bot] <109931778+mintlify[bot]@users.noreply.github.com>
---
 packages/docs/automated-evidence.mdx | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/docs/automated-evidence.mdx b/packages/docs/automated-evidence.mdx
index 050519d13..11ae6800c 100644
--- a/packages/docs/automated-evidence.mdx
+++ b/packages/docs/automated-evidence.mdx
@@ -3,9 +3,13 @@ title: "Automated Evidence"
 description: "Comp AI Automated Evidence allows you to streamline evidence collection for recurring compliance tasks. "
 ---
 
+## Automated Evidence Demo
+
+<iframe src="https://www.loom.com/embed/6e80c92e12c4478ab009bc86f7b21f4a" title="Loom video player" frameborder="0" className="w-full aspect-video rounded-xl" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share" allowfullscreen />
+
 ### Create Automations
 
-To create automations for evidence collection, simply click into any task on the app, and click on the "Create Automation" button. 
+To create automations for evidence collection, simply click into any task on the app, and click on the "Create Automation" button.
 
 This will take you to the chat agent, here, you will enter a prompt based on the task and evidence required for that task.
 
@@ -14,7 +18,7 @@ This will take you to the chat agent, here, you will enter a prompt based on the
 In this example, we will use the project ‘Secure Code’ for this task. We need to show that Dependabot (or a similar tool) is enabled and scanning the dependencies in our codebase. For this prompt, we would say:\
 “Check if Dependabot is enabled in my GitHub repository and return the results.”
 
-###  Testing & Publishing Automations
+### Testing & Publishing Automations
 
 Once prompted, the agent will run through the process of creating an automation to check for and return any Dependabot alerts, requesting any relevant keys or tokens required by that specific vendor to complete the automation.
 

From 2a7be98564dd3bd7ef7a209f923279593cc4b36c Mon Sep 17 00:00:00 2001
From: "mintlify[bot]" <109931778+mintlify[bot]@users.noreply.github.com>
Date: Mon, 27 Oct 2025 15:15:07 -0400
Subject: [PATCH 2/4] Doc Updates (#1692)

* Documentation edits made through Mintlify web editor

* Documentation edits made through Mintlify web editor

* Documentation edits made through Mintlify web editor

---------

Signed-off-by: Mariano Fuentes <marfuen98@gmail.com>
Co-authored-by: mintlify[bot] <109931778+mintlify[bot]@users.noreply.github.com>
Co-authored-by: Mariano Fuentes <marfuen98@gmail.com>
---
 packages/docs/automated-evidence.mdx          |  2 +-
 .../{integrations => cloud-tests}/aws.mdx     |  4 +-
 .../{integrations => cloud-tests}/azure.mdx   | 38 ++++++++-----------
 .../{integrations => cloud-tests}/deel.mdx    |  0
 .../{integrations => cloud-tests}/gcp.mdx     | 26 ++++++-------
 .../{integrations => cloud-tests}/index.mdx   | 32 +++++-----------
 packages/docs/docs.json                       | 12 +++---
 7 files changed, 48 insertions(+), 66 deletions(-)
 rename packages/docs/{integrations => cloud-tests}/aws.mdx (94%)
 rename packages/docs/{integrations => cloud-tests}/azure.mdx (81%)
 rename packages/docs/{integrations => cloud-tests}/deel.mdx (100%)
 rename packages/docs/{integrations => cloud-tests}/gcp.mdx (79%)
 rename packages/docs/{integrations => cloud-tests}/index.mdx (52%)

diff --git a/packages/docs/automated-evidence.mdx b/packages/docs/automated-evidence.mdx
index 11ae6800c..dc3edb68a 100644
--- a/packages/docs/automated-evidence.mdx
+++ b/packages/docs/automated-evidence.mdx
@@ -3,7 +3,7 @@ title: "Automated Evidence"
 description: "Comp AI Automated Evidence allows you to streamline evidence collection for recurring compliance tasks. "
 ---
 
-## Automated Evidence Demo
+### Automated Evidence Demo
 
 <iframe src="https://www.loom.com/embed/6e80c92e12c4478ab009bc86f7b21f4a" title="Loom video player" frameborder="0" className="w-full aspect-video rounded-xl" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share" allowfullscreen />
 
diff --git a/packages/docs/integrations/aws.mdx b/packages/docs/cloud-tests/aws.mdx
similarity index 94%
rename from packages/docs/integrations/aws.mdx
rename to packages/docs/cloud-tests/aws.mdx
index cec497f4c..dfece9fcf 100644
--- a/packages/docs/integrations/aws.mdx
+++ b/packages/docs/cloud-tests/aws.mdx
@@ -1,6 +1,6 @@
 ---
-title: "AWS Integration"
-description: "The AWS integration allows you to connect your AWS infrastructure to Comp AI for automated security testing using Security Hub, compliance monitoring, and risk assessment."
+title: "AWS Cloud Tests"
+description: "AWS Cloud Tests allows you to connect your AWS infrastructure to Comp AI for automated security testing using Security Hub, compliance monitoring, and risk assessment."
 ---
 
 # Setup Process
diff --git a/packages/docs/integrations/azure.mdx b/packages/docs/cloud-tests/azure.mdx
similarity index 81%
rename from packages/docs/integrations/azure.mdx
rename to packages/docs/cloud-tests/azure.mdx
index 7cbfb0e27..fe6ff0677 100644
--- a/packages/docs/integrations/azure.mdx
+++ b/packages/docs/cloud-tests/azure.mdx
@@ -1,11 +1,11 @@
 ---
-title: 'Azure Integration'
-description: 'Connect Azure to Comp AI for cloud security testing'
+title: "Azure Cloud Tests"
+description: "Connect Azure to Comp AI for cloud security testing"
 ---
 
-# Azure Integration
+# Azure Cloud Test
 
-The Azure integration enables you to connect your Microsoft Azure cloud environment to Comp AI for comprehensive security testing, compliance monitoring, and risk assessment using Microsoft Defender for Cloud
+The Azure Cloud Test enables you to connect your Microsoft Azure cloud environment to Comp AI for comprehensive security testing, compliance monitoring, and risk assessment using Microsoft Defender for Cloud
 
 ## Setup Process
 
@@ -20,46 +20,40 @@ Before setting up the integration, ensure you have:
 ### Configuration Steps
 
 1. **Log into your Azure Portal**
-   - Visit [https://portal.azure.com](https://portal.azure.com)
-
+   - Visit https://portal.azure.com
 2. **Enable Microsoft Defender for Cloud**
    - In the left-hand menu, search for and select **Microsoft Defender for Cloud**
    - Click **Getting started**
    - Select the subscription(s) you want to onboard
    - Enable **Microsoft Defender plans** (especially for relevant services like Compute, Storage, SQL, etc.)
    - Wait for the provisioning to complete (this may take a few minutes)
-
 3. **Register an Application in Azure AD**
-   - Navigate to **Azure Active Directory > App registrations**
-   - Click **+ New registration**
+   - Navigate to **Azure Active Directory \> App registrations**
+   - Click **\+ New registration**
    - Name the app (e.g., `CompAIIntegrationApp`)
    - Choose **Accounts in this organizational directory only**
    - Click **Register**
-
 4. **Get the Client ID and Tenant ID**
    - After registration, go to the app's **Overview** page
    - Copy the **Application (client) ID**
    - Copy the **Directory (tenant) ID**
-
 5. **Create a Client Secret**
    - In the app menu, go to **Certificates & secrets**
-   - Under **Client secrets**, click **+ New client secret**
+   - Under **Client secrets**, click **\+ New client secret**
    - Add a description and set an expiration
    - Click **Add**
    - Copy the **Client secret value** — you won’t be able to see it again!
-
 6. **Assign the Application Access to a Subscription**
    - Go to **Subscriptions** in the Azure portal
    - Select the subscription you want to integrate
    - Copy the **Subscription ID**
    - Click **Access control (IAM)**
-   - Click **+ Add > Add role assignment**
+   - Click **\+ Add \> Add role assignment**
    - Select role: **Reader** (or **Security Reader** for enhanced visibility)
    - Assign access to: **User, group, or service principal**
    - Select your registered application
-
 7. **Connect Azure to Comp AI**
-   - Go to **Settings > Integrations** in your Comp AI dashboard
+   - Go to **Settings \> Integrations** in your Comp AI dashboard
    - Click **Connect** next to the Azure integration card
    - Paste the following values:
      - **Client ID**
@@ -72,7 +66,7 @@ Before setting up the integration, ensure you have:
 
 ### Security Tests
 
-The Azure integration performs the following security assessments:
+The Azure Cloud Test performs the following security assessments:
 
 | Test Category     | Description                                                               |
 | ----------------- | ------------------------------------------------------------------------- |
@@ -86,7 +80,7 @@ The Azure integration performs the following security assessments:
 
 ### Compliance Frameworks
 
-The integration checks compliance against:
+The Cloud Test checks compliance against:
 
 - Microsoft Cloud Security Benchmark
 - SOC 2
@@ -119,16 +113,16 @@ The integration does NOT have permissions to:
 
 ### Common Issues
 
-**Issue**: Failed to connect Azure subscription  
+**Issue**: Failed to connect Azure subscription\
 **Solution**: Verify service principal credentials and role assignments
 
-**Issue**: Authentication errors  
+**Issue**: Authentication errors\
 **Solution**: Ensure the service principal hasn't expired and secret is valid
 
 ### Support
 
-For additional assistance with your Azure integration:
+For additional assistance with your Azure Cloud Tests:
 
 1. Check our [Knowledge Base](https://help.trycomp.ai/azure-integration)
 2. Contact support at [support@trycomp.ai](mailto:support@trycomp.ai)
-3. Join our [Discord community](https://discord.gg/compai) for peer support
+3. Join our [Discord community](https://discord.gg/compai) for peer support
\ No newline at end of file
diff --git a/packages/docs/integrations/deel.mdx b/packages/docs/cloud-tests/deel.mdx
similarity index 100%
rename from packages/docs/integrations/deel.mdx
rename to packages/docs/cloud-tests/deel.mdx
diff --git a/packages/docs/integrations/gcp.mdx b/packages/docs/cloud-tests/gcp.mdx
similarity index 79%
rename from packages/docs/integrations/gcp.mdx
rename to packages/docs/cloud-tests/gcp.mdx
index c4271e5db..a8f64ee06 100644
--- a/packages/docs/integrations/gcp.mdx
+++ b/packages/docs/cloud-tests/gcp.mdx
@@ -1,17 +1,17 @@
 ---
-title: 'GCP Integration'
-description: 'Connect Google Cloud Platform to Comp AI for cloud security testing'
+title: "GCP Cloud Tests"
+description: "Connect Google Cloud Platform to Comp AI for cloud security testing"
 ---
 
-# Google Cloud Platform Integration
+# Google Cloud Platform Cloud Test
 
-The Google Cloud Platform (GCP) integration allows you to connect your GCP projects to Comp AI for automated compliance monitoring, and risk assessment.
+The Google Cloud Platform (GCP) Cloud Test allows you to connect your GCP projects to Comp AI for automated compliance monitoring, and risk assessment.
 
 ## Setup Process
 
 ### Prerequisites
 
-Before setting up the integration, ensure you have:
+Before setting up the Cloud Test, ensure you have:
 
 1. GCP project with Owner or Editor access
 2. Admin access to your Comp AI workspace
@@ -19,7 +19,7 @@ Before setting up the integration, ensure you have:
 
 ### Configuration Steps
 
-1. Navigate to **Settings > Integrations** in your Comp AI dashboard
+1. Navigate to **Cloud Tests** in your Comp AI dashboard
 2. Click on **Connect** next to the GCP integration card
 3. Link Service Account
    - Go to the [GCP Console → IAM & Admin → Service Accounts](https://console.cloud.google.com/iam-admin/serviceaccounts)
@@ -43,7 +43,7 @@ Before setting up the integration, ensure you have:
 
 ### Security Tests
 
-The GCP integration performs the following security assessments:
+The GCP Cloud Test performs the following security assessments:
 
 | Test Category     | Description                                                           |
 | ----------------- | --------------------------------------------------------------------- |
@@ -57,7 +57,7 @@ The GCP integration performs the following security assessments:
 
 ### Compliance Frameworks
 
-The integration checks compliance against:
+The Cloud Test checks compliance against:
 
 - CIS GCP Foundation Benchmark
 - SOC 2
@@ -70,7 +70,7 @@ The integration checks compliance against:
 
 ### Access Control
 
-Comp AI requires read-only access to your GCP environment. The integration uses a service account with specific IAM roles that follow the principle of least privilege.
+Comp AI requires read-only access to your GCP environment. The Cloud Test uses a service account with specific IAM roles that follow the principle of least privilege.
 
 ### Permissions
 
@@ -90,13 +90,13 @@ The integration does NOT have permissions to:
 
 ### Common Issues
 
-**Issue**: Failed to connect GCP project  
+**Issue**: Failed to connect GCP project\
 **Solution**: Verify organization id and service account key and IAM permissions
 
-**Issue**: Missing scan results for specific services  
+**Issue**: Missing scan results for specific services\
 **Solution**: Check IAM permissions for those specific services
 
-**Issue**: Authentication errors  
+**Issue**: Authentication errors\
 **Solution**: Ensure the service account key is valid and not expired
 
 ### Support
@@ -105,4 +105,4 @@ For additional assistance with your GCP integration:
 
 1. Check our [Knowledge Base](https://help.trycomp.ai/gcp-integration)
 2. Contact support at [support@trycomp.ai](mailto:support@trycomp.ai)
-3. Join our [Discord community](https://discord.gg/compai) for peer support
+3. Join our [Discord community](https://discord.gg/compai) for peer support
\ No newline at end of file
diff --git a/packages/docs/integrations/index.mdx b/packages/docs/cloud-tests/index.mdx
similarity index 52%
rename from packages/docs/integrations/index.mdx
rename to packages/docs/cloud-tests/index.mdx
index 25c1fd761..55ac974b8 100644
--- a/packages/docs/integrations/index.mdx
+++ b/packages/docs/cloud-tests/index.mdx
@@ -1,29 +1,17 @@
 ---
-title: 'Integrations'
-description: 'Comp AI Integration Guide'
+title: "Cloud Tests"
+description: "Comp AI Cloud Tests Guide"
 ---
 
-## Supported Integrations
+## Supported Cloud Tests
 
-Comp AI offers several integrations with third-party services to enhance your experience:
-
-### Deel Integration
-
-Use Deel integration to automatically import employee information into Comp AI.
-
-- **Purpose**: Streamline employee onboarding and data management
-- **Features**:
-  - Automated employee data import
-  - Synchronization of employee details
-  - Regular data refresh options
-
-For setup instructions, see the [Deel Integration Guide](/integrations/deel).
+Comp AI offers several Cloud Tests with third-party services to enhance your experience:
 
 ### Cloud Provider Integrations
 
 Comp AI integrates with major cloud providers to facilitate cloud security testing and compliance monitoring:
 
-#### AWS Integration
+#### AWS Cloud Test
 
 - **Purpose**: Perform security tests and compliance checks on AWS infrastructure
 - **Features**:
@@ -32,9 +20,9 @@ Comp AI integrates with major cloud providers to facilitate cloud security testi
   - EC2 instance compliance monitoring
   - CloudTrail audit log analysis
 
-For setup instructions, see the [AWS Integration Guide](/integrations/aws).
+For setup instructions, see the [AWS Cloud Tests Guide](/integrations/aws).
 
-#### Azure Integration
+#### Azure Cloud Test
 
 - **Purpose**: Perform security tests and compliance checks on Azure infrastructure
 - **Features**:
@@ -43,9 +31,9 @@ For setup instructions, see the [AWS Integration Guide](/integrations/aws).
   - Storage account compliance checks
   - Network security evaluation
 
-For setup instructions, see the [Azure Integration Guide](/integrations/azure).
+For setup instructions, see the [Azure Cloud Tests Guide](/integrations/azure).
 
-#### GCP Integration
+#### GCP Cloud Test
 
 - **Purpose**: Perform security tests and compliance checks on Google Cloud Platform
 - **Features**:
@@ -54,4 +42,4 @@ For setup instructions, see the [Azure Integration Guide](/integrations/azure).
   - Compute Engine compliance monitoring
   - Cloud logging audit analysis
 
-For setup instructions, see the [GCP Integration Guide](/integrations/gcp).
+For setup instructions, see the [GCP Cloud Tests Guide](/integrations/gcp).
\ No newline at end of file
diff --git a/packages/docs/docs.json b/packages/docs/docs.json
index 950ba9993..9b8df5d76 100644
--- a/packages/docs/docs.json
+++ b/packages/docs/docs.json
@@ -20,15 +20,15 @@
         ]
       },
       {
-        "tab": "Integrations",
+        "tab": "Cloud Tests",
         "groups": [
           {
-            "group": "Integrations Guides",
+            "group": "Cloud Test Guides",
             "pages": [
-              "integrations/index",
-              "integrations/aws",
-              "integrations/azure",
-              "integrations/gcp"
+              "cloud-tests/index",
+              "cloud-tests/aws",
+              "cloud-tests/azure",
+              "cloud-tests/gcp"
             ]
           }
         ]

From e03f5dee1a803a333ec9e03aa658ccc445c5160f Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 27 Oct 2025 19:03:50 -0400
Subject: [PATCH 3/4] [dev] [Marfuen] mariano/automation-resolver (#1681)

* feat(automation): add evaluation criteria and status to automations

* feat(automation): update button styles based on test state

* chore(hooks): enable revalidation on focus and add deduping interval

* refactor(automation): redesign TestResultsPanel layout and enhance functionality

* refactor(automation): update TestResultsPanel with new button and layout enhancements

* refactor(automation): add fail state icon and update test completion message

* refactor(docs): update README with detailed setup instructions and env variables

* fix(tasks): add 'failed' status to task statuses and update indicators

* chore(db): update @trycompai/db package version to 1.3.15

* refactor(types): replace inline types with Policy and Task interfaces

---------

Co-authored-by: Mariano Fuentes <marfuen98@gmail.com>
---
 README.md                                     |  57 ++-
 apps/app/.env.example                         |  75 +++-
 .../frameworks/components/Overview.tsx        |  26 +-
 .../frameworks/components/ToDoOverview.tsx    |  13 +-
 .../[orgId]/frameworks/lib/getPolicies.ts     |   5 -
 .../(app)/[orgId]/frameworks/lib/getTasks.ts  |   5 -
 .../secrets/components/EditSecretDialog.tsx   | 229 ++++++++++
 .../secrets/components/table/SecretsTable.tsx |  67 ++-
 .../actions/task-automation-actions.ts        |  48 ++
 .../automation/[automationId]/chat.tsx        |  36 +-
 .../components/chat/EmptyState.tsx            |  31 +-
 .../evaluation/EvaluationCriteriaCard.tsx     | 146 ++++++
 .../workflow/components/TestResultsPanel.tsx  | 422 ++++++++++--------
 .../components/UnifiedWorkflowCard.tsx        |  26 +-
 .../components/workflow/types.ts              |   2 +
 .../workflow/workflow-visualizer-simple.tsx   |  47 +-
 .../hooks/use-task-automation-execution.ts    |   2 +
 .../hooks/use-task-automation.ts              |   6 +-
 .../[automationId]/lib/types/index.ts         |   2 +
 .../components/AutomationOverview.tsx         | 174 +++++---
 .../overview/components/MetricsSection.tsx    | 177 +++++---
 .../components/AutomationRunsCard.tsx         |  25 ++
 .../[taskId]/components/TaskAutomations.tsx   |  24 +-
 .../tasks/[taskId]/components/constants.ts    |   2 +-
 .../[orgId]/tasks/actions/updateTaskStatus.ts |   4 +-
 .../tasks/components/TaskStatusIndicator.tsx  |   5 +-
 .../tasks/components/TaskStatusSelector.tsx   |   8 +-
 apps/app/src/components/status-indicator.tsx  |   4 +
 apps/app/trigger.config.ts                    |   2 +-
 packages/db/.env.example                      |   2 +-
 packages/db/package.json                      |   2 +-
 .../migration.sql                             |   9 +
 .../migration.sql                             |   2 +
 .../migration.sql                             |   2 +
 .../db/prisma/schema/automation-run.prisma    |   9 +
 packages/db/prisma/schema/automation.prisma   |   4 +-
 packages/db/prisma/schema/task.prisma         |   1 +
 37 files changed, 1255 insertions(+), 446 deletions(-)
 create mode 100644 apps/app/src/app/(app)/[orgId]/settings/secrets/components/EditSecretDialog.tsx
 create mode 100644 apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/evaluation/EvaluationCriteriaCard.tsx
 create mode 100644 packages/db/prisma/migrations/20251021174901_add_automation_evaluation_fields/migration.sql
 create mode 100644 packages/db/prisma/migrations/20251022132716_add_is_enabled_column_to_evidence_automations/migration.sql
 create mode 100644 packages/db/prisma/migrations/20251022164236_add_failed_status_to_task/migration.sql

diff --git a/README.md b/README.md
index b95f10a37..1eb2f6bd5 100644
--- a/README.md
+++ b/README.md
@@ -81,39 +81,68 @@ Here is what you need to be able to run Comp AI.
 
 ## Development
 
-To get the project working locally with all integrations, follow these extended development steps.
+To get the project working locally with all integrations, follow these extended development steps
 
 ### Setup
 
-1. Clone the repo:
+## Add environment variables and fill them out with your credentials
 
-   ```sh
-   git clone https://github.com/trycompai/comp.git
-   ```
+```sh
+cp apps/app/.env.example apps/app/.env
+cp apps/portal/.env.example apps/portal/.env
+cp packages/db/.env.example packages/db/.env
+```
 
-2. Navigate to the project directory:
+## Get code running locally
 
-   ```sh
-   cd comp
-   ```
+1. Clone the repo
+
+```sh
+git clone https://github.com/trycompai/comp.git
+```
 
-3. Install dependencies using Bun:
+2. Navigate to the project directory
 
 ```sh
-   bun install
+cd comp
 ```
 
-4. Install `concurrently` as a dev dependency:
+3. Install dependencies using Bun
 
 ```sh
-   bun add -d concurrently
+bun install
+```
+
+4. Get Database Running
+
+```sh
+cd packages/db
+bun run docker:up # Spin up docker container
+bun run db:migrate # Run migrations
+```
+
+5. Generate Prisma Types for each app
+
+```sh
+cd apps/app
+bun run db:generate
+cd ../portal
+bun run db:generate
+cd ../api
+bun run db:generate
+```
+
+6. Run all apps in parallel from the root directory
+
+```sh
+bun run dev
 ```
 
 ---
 
 ### Environment Setup
 
-Create the following `.env` files and fill them out with your credentials:
+Create the following `.env` files and fill them out with your credentials
 
 - `comp/apps/app/.env`
 - `comp/apps/portal/.env`
diff --git a/apps/app/.env.example b/apps/app/.env.example
index 883e586e4..cf8f3fdf3 100644
--- a/apps/app/.env.example
+++ b/apps/app/.env.example
@@ -1,23 +1,54 @@
-# Required
-AUTH_SECRET="" # openssl rand -base64 32
-DATABASE_URL="" # Format: "postgresql://postgres:pass@127.0.0.1:5432/comp"
-RESEND_DOMAIN=" # Domain configured in Resend, e.g. mail.trycomp.ai
-RESEND_API_KEY="" # API key from Resend for email authentication / invites
-REVALIDATION_SECRET="" # openssl rand -base64 32
-NEXT_PUBLIC_PORTAL_URL="http://localhost:3002" # The employee portal uses port 3002 by default
-
-# Recommended
-# Store attachments in any S3 compatible bucket, we use AWS
-APP_AWS_ACCESS_KEY_ID="" # AWS Access Key ID
-APP_AWS_SECRET_ACCESS_KEY="" # AWS Secret Access Key
-APP_AWS_REGION="" # AWS Region
-APP_AWS_BUCKET_NAME="" # AWS Bucket Name
-
-TRIGGER_SECRET_KEY="" # For background jobs. Self-host or use cloud-version @ https://trigger.dev
-# TRIGGER_API_URL="" # Only set if you are self-hosting
-TRIGGER_API_KEY="" # API key from Trigger.dev
-TRIGGER_SECRET_KEY="" # Secret key from Trigger.dev
-
-OPENAI_API_KEY="" # AI Chat + Auto Generated Policies, Risks + Vendors
-FIRECRAWL_API_KEY="" # For research, self-host or use cloud-version @ https://firecrawl.dev
+# Authentication & Database
 
+AUTH_GOOGLE_ID="" # Google login
+AUTH_GOOGLE_SECRET="" # Google Login
+AUTH_GITHUB_ID="" # Optional
+AUTH_GITHUB_SECRET="" # Optional
+DATABASE_URL="postgresql://postgres:postgres@localhost:5432/comp" # Should be the default
+AUTH_SECRET="" # Used for auth, use something random and strong
+SECRET_KEY="" # Used for encrypting data, use something random and strong
+NEXT_PUBLIC_BETTER_AUTH_URL=http://localhost:3000 # Must point to the domain hosting the app
+
+# Upstash
+UPSTASH_REDIS_REST_URL="" # Optional, used for rate limiting
+UPSTASH_REDIS_REST_TOKEN="" # Optional, used for rate limiting
+
+# OpenAI
+OPENAI_API_KEY="" # Required for app to work
+
+# Resend
+RESEND_API_KEY="" # For sending emails, app notifications, etc.
+
+# Trigger
+TRIGGER_SECRET_KEY="" # Required, for all async jobs and tasks
+
+# Posthog
+NEXT_PUBLIC_POSTHOG_HOST=/ingest # GTM Trackers
+NEXT_PUBLIC_POSTHOG_KEY="" # GTM Trackers
+
+# Vercel
+VERCEL_ACCESS_TOKEN="" # For trust portal domains
+VERCEL_TEAM_ID="" # For trust portal domains
+VERCEL_PROJECT_ID="" # For trust portal domains
+NEXT_PUBLIC_VERCEL_URL="" # eg. trycomp.ai
+
+# AWS
+APP_AWS_BUCKET_NAME="" # Required, for task attachments
+APP_AWS_REGION="" # Required, for task attachments
+APP_AWS_ACCESS_KEY_ID="" # Required, for task attachments
+APP_AWS_SECRET_ACCESS_KEY="" # Required, for task attachments
+
+# TRIGGER REVAL
+REVALIDATION_SECRET="" # Revalidate server side, generate something random
+
+GROQ_API_KEY="" # For the AI chat, on dashboard
+NEXT_PUBLIC_PORTAL_URL="http://localhost:3001"
+ANTHROPIC_API_KEY="" # Optional, For more options with models
+BETTER_AUTH_URL=http://localhost:3000 # For auth
+
+NEXT_OUTPUT_STANDALONE=false # For deploying on AWS instead of Vercel
+
+FLEET_URL="" # If you want to enable MDM, your hosted url
+FLEET_TOKEN="" # If you want to enable MDM
+
+FIRECRAWL_API_KEY="" # To research vendors, Required
\ No newline at end of file
diff --git a/apps/app/src/app/(app)/[orgId]/frameworks/components/Overview.tsx b/apps/app/src/app/(app)/[orgId]/frameworks/components/Overview.tsx
index a3d7a3431..be88095ca 100644
--- a/apps/app/src/app/(app)/[orgId]/frameworks/components/Overview.tsx
+++ b/apps/app/src/app/(app)/[orgId]/frameworks/components/Overview.tsx
@@ -1,6 +1,6 @@
 'use client';
 
-import { FrameworkEditorFramework } from '@db';
+import { FrameworkEditorFramework, Policy, Task } from '@db';
 import { FrameworkInstanceWithControls } from '../types';
 import { ComplianceOverview } from './ComplianceOverview';
 import { DraggableCards } from './DraggableCards';
@@ -11,31 +11,15 @@ import { FrameworkInstanceWithComplianceScore } from './types';
 export interface PublishedPoliciesScore {
   totalPolicies: number;
   publishedPolicies: number;
-  draftPolicies: {
-    id: string;
-    status: 'draft' | 'published' | 'needs_review';
-    name: string;
-  }[];
-  policiesInReview: {
-    id: string;
-    status: 'draft' | 'published' | 'needs_review';
-    name: string;
-  }[];
-  unpublishedPolicies: {
-    id: string;
-    status: 'draft' | 'published' | 'needs_review';
-    name: string;
-  }[];
+  draftPolicies: Policy[];
+  policiesInReview: Policy[];
+  unpublishedPolicies: Policy[];
 }
 
 export interface DoneTasksScore {
   totalTasks: number;
   doneTasks: number;
-  incompleteTasks: {
-    id: string;
-    title: string;
-    status: 'todo' | 'in_progress' | 'done' | 'not_relevant';
-  }[];
+  incompleteTasks: Task[];
 }
 
 export interface OverviewProps {
diff --git a/apps/app/src/app/(app)/[orgId]/frameworks/components/ToDoOverview.tsx b/apps/app/src/app/(app)/[orgId]/frameworks/components/ToDoOverview.tsx
index a83c87365..70af41486 100644
--- a/apps/app/src/app/(app)/[orgId]/frameworks/components/ToDoOverview.tsx
+++ b/apps/app/src/app/(app)/[orgId]/frameworks/components/ToDoOverview.tsx
@@ -5,6 +5,7 @@ import { Button } from '@comp/ui/button';
 import { Card, CardContent, CardHeader, CardTitle } from '@comp/ui/card';
 import { ScrollArea } from '@comp/ui/scroll-area';
 import { Tabs, TabsContent, TabsList, TabsTrigger } from '@comp/ui/tabs';
+import { Policy, Task } from '@db';
 import {
   ArrowRight,
   CheckCircle2,
@@ -20,18 +21,6 @@ import { useMemo, useState } from 'react';
 import { toast } from 'sonner';
 import { ConfirmActionDialog } from './ConfirmActionDialog';
 
-interface Policy {
-  id: string;
-  name: string;
-  status: 'draft' | 'published' | 'needs_review';
-}
-
-interface Task {
-  id: string;
-  title: string;
-  status: 'todo' | 'in_progress' | 'done' | 'not_relevant';
-}
-
 export function ToDoOverview({
   totalPolicies,
   totalTasks,
diff --git a/apps/app/src/app/(app)/[orgId]/frameworks/lib/getPolicies.ts b/apps/app/src/app/(app)/[orgId]/frameworks/lib/getPolicies.ts
index 8288acda2..eede592be 100644
--- a/apps/app/src/app/(app)/[orgId]/frameworks/lib/getPolicies.ts
+++ b/apps/app/src/app/(app)/[orgId]/frameworks/lib/getPolicies.ts
@@ -5,11 +5,6 @@ export async function getPublishedPoliciesScore(organizationId: string) {
     where: {
       organizationId,
     },
-    select: {
-      id: true,
-      name: true,
-      status: true,
-    },
   });
 
   const publishedPolicies = allPolicies.filter((p) => p.status === 'published');
diff --git a/apps/app/src/app/(app)/[orgId]/frameworks/lib/getTasks.ts b/apps/app/src/app/(app)/[orgId]/frameworks/lib/getTasks.ts
index e02fbd21d..db924a8ca 100644
--- a/apps/app/src/app/(app)/[orgId]/frameworks/lib/getTasks.ts
+++ b/apps/app/src/app/(app)/[orgId]/frameworks/lib/getTasks.ts
@@ -6,11 +6,6 @@ export const getDoneTasks = cache(async (organizationId: string) => {
     where: {
       organizationId,
     },
-    select: {
-      id: true,
-      title: true,
-      status: true,
-    },
   });
 
   const doneTasks = tasks.filter((t) => t.status === 'done');
diff --git a/apps/app/src/app/(app)/[orgId]/settings/secrets/components/EditSecretDialog.tsx b/apps/app/src/app/(app)/[orgId]/settings/secrets/components/EditSecretDialog.tsx
new file mode 100644
index 000000000..0c4d746dd
--- /dev/null
+++ b/apps/app/src/app/(app)/[orgId]/settings/secrets/components/EditSecretDialog.tsx
@@ -0,0 +1,229 @@
+'use client';
+
+import { Button } from '@comp/ui/button';
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+} from '@comp/ui/dialog';
+import { Input } from '@comp/ui/input';
+import { Label } from '@comp/ui/label';
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@comp/ui/select';
+import { Textarea } from '@comp/ui/textarea';
+import { zodResolver } from '@hookform/resolvers/zod';
+import { Loader2 } from 'lucide-react';
+import { useEffect } from 'react';
+import { Controller, useForm } from 'react-hook-form';
+import { toast } from 'sonner';
+import { z } from 'zod';
+
+interface EditSecretDialogProps {
+  secret: {
+    id: string;
+    name: string;
+    description: string | null;
+    category: string | null;
+  };
+  open: boolean;
+  onOpenChange: (open: boolean) => void;
+  onSecretUpdated?: () => void;
+}
+
+const editSecretSchema = z.object({
+  name: z
+    .string()
+    .min(1, 'Name is required')
+    .max(100, 'Name is too long')
+    .regex(/^[A-Z0-9_]+$/, 'Name must be uppercase letters, numbers, and underscores only'),
+  value: z.string().optional(),
+  description: z.string().optional(),
+  category: z.string().optional(),
+});
+
+type EditSecretFormValues = z.infer<typeof editSecretSchema>;
+
+export function EditSecretDialog({
+  secret,
+  open,
+  onOpenChange,
+  onSecretUpdated,
+}: EditSecretDialogProps) {
+  const {
+    handleSubmit,
+    control,
+    register,
+    reset,
+    setError,
+    formState: { errors, isSubmitting },
+  } = useForm<EditSecretFormValues>({
+    resolver: zodResolver(editSecretSchema),
+    defaultValues: {
+      name: secret.name,
+      value: '',
+      description: secret.description || '',
+      category: secret.category || '',
+    },
+    mode: 'onChange',
+  });
+
+  // Reset form when secret changes
+  useEffect(() => {
+    reset({
+      name: secret.name,
+      value: '',
+      description: secret.description || '',
+      category: secret.category || '',
+    });
+  }, [secret, reset]);
+
+  const onSubmit = handleSubmit(async (values) => {
+    // Get organizationId from the URL path
+    const pathSegments = window.location.pathname.split('/');
+    const orgId = pathSegments[1];
+
+    try {
+      // Only send fields that have values
+      const updateData: Record<string, string | null> = {
+        organizationId: orgId,
+      };
+      if (values.name !== secret.name) updateData.name = values.name;
+      if (values.value) updateData.value = values.value;
+      if (values.description !== secret.description)
+        updateData.description = values.description || null;
+      if (values.category !== secret.category) updateData.category = values.category || null;
+
+      const response = await fetch(`/api/secrets/${secret.id}`, {
+        method: 'PUT',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify(updateData),
+      });
+
+      if (!response.ok) {
+        const error = await response.json();
+        // Map Zod errors to form fields
+        if (Array.isArray(error.details)) {
+          let handled = false;
+          for (const issue of error.details) {
+            const field = issue?.path?.[0] as keyof EditSecretFormValues | undefined;
+            if (field) {
+              setError(field, { type: 'server', message: issue.message });
+              handled = true;
+            }
+          }
+          if (handled) return;
+        }
+        throw new Error(error.error || 'Failed to update secret');
+      }
+
+      toast.success('Secret updated successfully');
+      onOpenChange(false);
+      reset();
+
+      if (onSecretUpdated) onSecretUpdated();
+      else window.location.reload();
+    } catch (err) {
+      toast.error(err instanceof Error ? err.message : 'Failed to update secret');
+      console.error('Error updating secret:', err);
+    }
+  });
+
+  return (
+    <Dialog open={open} onOpenChange={onOpenChange}>
+      <DialogContent className="sm:max-w-[525px]">
+        <form onSubmit={onSubmit}>
+          <DialogHeader>
+            <DialogTitle>Edit Secret</DialogTitle>
+            <DialogDescription>
+              Update the secret details. Leave value empty to keep the existing value.
+            </DialogDescription>
+          </DialogHeader>
+          <div className="grid gap-4 py-4">
+            <div className="grid gap-2">
+              <Label htmlFor="edit-name">Secret Name</Label>
+              <Input
+                id="edit-name"
+                placeholder="e.g., GITHUB_TOKEN, OPENAI_API_KEY"
+                {...register('name')}
+              />
+              {errors.name?.message ? (
+                <p className="text-xs text-destructive mt-1">{errors.name.message}</p>
+              ) : null}
+              <p className="text-xs text-muted-foreground">
+                Use uppercase with underscores for naming convention
+              </p>
+            </div>
+            <div className="grid gap-2">
+              <Label htmlFor="edit-value">Secret Value (Optional)</Label>
+              <Input
+                id="edit-value"
+                type="password"
+                placeholder="Leave empty to keep existing value"
+                {...register('value')}
+              />
+              {errors.value?.message ? (
+                <p className="text-xs text-destructive mt-1">{errors.value.message}</p>
+              ) : null}
+              <p className="text-xs text-muted-foreground">
+                Only provide a value if you want to update it
+              </p>
+            </div>
+            <div className="grid gap-2">
+              <Label htmlFor="edit-category">Category (Optional)</Label>
+              <Controller
+                control={control}
+                name="category"
+                render={({ field }) => (
+                  <Select value={field.value} onValueChange={field.onChange}>
+                    <SelectTrigger id="edit-category">
+                      <SelectValue placeholder="Select a category" />
+                    </SelectTrigger>
+                    <SelectContent>
+                      <SelectItem value="api_keys">API Keys</SelectItem>
+                      <SelectItem value="database">Database</SelectItem>
+                      <SelectItem value="authentication">Authentication</SelectItem>
+                      <SelectItem value="integration">Integration</SelectItem>
+                      <SelectItem value="other">Other</SelectItem>
+                    </SelectContent>
+                  </Select>
+                )}
+              />
+              {errors.category?.message ? (
+                <p className="text-xs text-destructive mt-1">{errors.category.message}</p>
+              ) : null}
+            </div>
+            <div className="grid gap-2">
+              <Label htmlFor="edit-description">Description (Optional)</Label>
+              <Textarea
+                id="edit-description"
+                placeholder="Describe what this secret is used for"
+                rows={3}
+                {...register('description')}
+              />
+              {errors.description?.message ? (
+                <p className="text-xs text-destructive mt-1">{errors.description.message}</p>
+              ) : null}
+            </div>
+          </div>
+          <DialogFooter>
+            <Button type="button" variant="outline" onClick={() => onOpenChange(false)}>
+              Cancel
+            </Button>
+            <Button type="submit" disabled={isSubmitting}>
+              {isSubmitting ? (
+                <>
+                  <Loader2 className="mr-2 h-4 w-4 animate-spin" />
+                  Updating...
+                </>
+              ) : (
+                'Update Secret'
+              )}
+            </Button>
+          </DialogFooter>
+        </form>
+      </DialogContent>
+    </Dialog>
+  );
+}
diff --git a/apps/app/src/app/(app)/[orgId]/settings/secrets/components/table/SecretsTable.tsx b/apps/app/src/app/(app)/[orgId]/settings/secrets/components/table/SecretsTable.tsx
index 4dd6c16cb..a9b2c273f 100644
--- a/apps/app/src/app/(app)/[orgId]/settings/secrets/components/table/SecretsTable.tsx
+++ b/apps/app/src/app/(app)/[orgId]/settings/secrets/components/table/SecretsTable.tsx
@@ -5,10 +5,11 @@ import { Button } from '@comp/ui/button';
 import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from '@comp/ui/table';
 import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@comp/ui/tooltip';
 import { format } from 'date-fns';
-import { Copy, Eye, EyeOff, Loader2, Trash2 } from 'lucide-react';
+import { Copy, Edit, Eye, EyeOff, Loader2, Trash2 } from 'lucide-react';
 import { useState } from 'react';
 import { toast } from 'sonner';
 import { AddSecretDialog } from '../AddSecretDialog';
+import { EditSecretDialog } from '../EditSecretDialog';
 
 interface Secret {
   id: string;
@@ -27,6 +28,7 @@ interface SecretsTableProps {
 export function SecretsTable({ secrets }: SecretsTableProps) {
   const [revealedSecrets, setRevealedSecrets] = useState<Record<string, string>>({});
   const [loadingSecrets, setLoadingSecrets] = useState<Record<string, boolean>>({});
+  const [editingSecret, setEditingSecret] = useState<Secret | null>(null);
 
   const handleRevealSecret = async (secretId: string) => {
     if (revealedSecrets[secretId]) {
@@ -254,23 +256,42 @@ export function SecretsTable({ secrets }: SecretsTableProps) {
                     </span>
                   </TableCell>
                   <TableCell className="text-right pr-6">
-                    <TooltipProvider>
-                      <Tooltip>
-                        <TooltipTrigger asChild>
-                          <Button
-                            variant="ghost"
-                            size="icon"
-                            className="h-8 w-8 text-muted-foreground/50 hover:text-destructive hover:bg-destructive/10 transition-all"
-                            onClick={() => handleDeleteSecret(secret.id)}
-                          >
-                            <Trash2 className="h-4 w-4" />
-                          </Button>
-                        </TooltipTrigger>
-                        <TooltipContent>
-                          <p>Delete secret</p>
-                        </TooltipContent>
-                      </Tooltip>
-                    </TooltipProvider>
+                    <div className="flex items-center justify-end gap-1">
+                      <TooltipProvider>
+                        <Tooltip>
+                          <TooltipTrigger asChild>
+                            <Button
+                              variant="ghost"
+                              size="icon"
+                              className="h-8 w-8 text-muted-foreground/50 hover:text-primary hover:bg-primary/10 transition-all"
+                              onClick={() => setEditingSecret(secret)}
+                            >
+                              <Edit className="h-4 w-4" />
+                            </Button>
+                          </TooltipTrigger>
+                          <TooltipContent>
+                            <p>Edit secret</p>
+                          </TooltipContent>
+                        </Tooltip>
+                      </TooltipProvider>
+                      <TooltipProvider>
+                        <Tooltip>
+                          <TooltipTrigger asChild>
+                            <Button
+                              variant="ghost"
+                              size="icon"
+                              className="h-8 w-8 text-muted-foreground/50 hover:text-destructive hover:bg-destructive/10 transition-all"
+                              onClick={() => handleDeleteSecret(secret.id)}
+                            >
+                              <Trash2 className="h-4 w-4" />
+                            </Button>
+                          </TooltipTrigger>
+                          <TooltipContent>
+                            <p>Delete secret</p>
+                          </TooltipContent>
+                        </Tooltip>
+                      </TooltipProvider>
+                    </div>
                   </TableCell>
                 </TableRow>
               ))
@@ -278,6 +299,16 @@ export function SecretsTable({ secrets }: SecretsTableProps) {
           </TableBody>
         </Table>
       </div>
+
+      {/* Edit Secret Dialog */}
+      {editingSecret && (
+        <EditSecretDialog
+          secret={editingSecret}
+          open={!!editingSecret}
+          onOpenChange={(open) => !open && setEditingSecret(null)}
+          onSecretUpdated={() => window.location.reload()}
+        />
+      )}
     </div>
   );
 }
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/actions/task-automation-actions.ts b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/actions/task-automation-actions.ts
index fa89f92ef..13a14f103 100644
--- a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/actions/task-automation-actions.ts
+++ b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/actions/task-automation-actions.ts
@@ -412,3 +412,51 @@ export async function restoreVersion(
     };
   }
 }
+
+/**
+ * Update evaluation criteria for an automation
+ */
+export async function updateEvaluationCriteria(automationId: string, evaluationCriteria: string) {
+  try {
+    await db.evidenceAutomation.update({
+      where: { id: automationId },
+      data: { evaluationCriteria },
+    });
+
+    await revalidateCurrentPath();
+
+    return {
+      success: true,
+    };
+  } catch (error) {
+    console.error('[updateEvaluationCriteria] Failed:', error);
+    return {
+      success: false,
+      error: error instanceof Error ? error.message : 'Failed to update evaluation criteria',
+    };
+  }
+}
+
+/**
+ * Toggle automation enabled state
+ */
+export async function toggleAutomationEnabled(automationId: string, isEnabled: boolean) {
+  try {
+    await db.evidenceAutomation.update({
+      where: { id: automationId },
+      data: { isEnabled },
+    });
+
+    await revalidateCurrentPath();
+
+    return {
+      success: true,
+    };
+  } catch (error) {
+    console.error('[toggleAutomationEnabled] Failed:', error);
+    return {
+      success: false,
+      error: error instanceof Error ? error.message : 'Failed to toggle automation',
+    };
+  }
+}
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/chat.tsx b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/chat.tsx
index bb7d5597a..5c9070988 100644
--- a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/chat.tsx
+++ b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/chat.tsx
@@ -14,7 +14,7 @@ import { EmptyState } from './components/chat/EmptyState';
 import { Message } from './components/chat/message';
 import type { ChatUIMessage } from './components/chat/types';
 import { PanelHeader } from './components/panels/panels';
-import { Input } from './components/ui/input';
+import { Textarea } from './components/ui/textarea';
 import { useChatHandlers } from './hooks/use-chat-handlers';
 import { useTaskAutomation } from './hooks/use-task-automation';
 import { useSharedChatContext } from './lib/chat-context';
@@ -36,9 +36,21 @@ export function Chat({ className, orgId, taskId, taskName, automationId }: Props
     chat,
   });
   const { setChatStatus, scriptUrl } = useTaskAutomationStore();
-  const inputRef = useRef<HTMLInputElement | null>(null);
+  const inputRef = useRef<HTMLTextAreaElement | null>(null);
   const { automation } = useTaskAutomation();
 
+  // Auto-resize textarea
+  const handleInputChange = useCallback(
+    (e: React.ChangeEvent<HTMLTextAreaElement>) => {
+      setInput(e.target.value);
+      // Reset height to auto to get the correct scrollHeight
+      e.target.style.height = 'auto';
+      // Set height to scrollHeight (content height)
+      e.target.style.height = `${e.target.scrollHeight}px`;
+    },
+    [setInput],
+  );
+
   // Update shared ref when automation is loaded from hook
   if (automation?.id && automationIdRef.current === 'new') {
     automationIdRef.current = automation.id;
@@ -109,10 +121,11 @@ export function Chat({ className, orgId, taskId, taskName, automationId }: Props
         >
           <EmptyState
             input={input}
-            onInputChange={setInput}
+            onInputChange={handleInputChange}
             onExampleClick={handleExampleClick}
             status={status}
             inputRef={inputRef}
+            onSubmit={() => validateAndSubmitMessage(input)}
           />
         </form>
       ) : (
@@ -139,11 +152,24 @@ export function Chat({ className, orgId, taskId, taskName, automationId }: Props
               validateAndSubmitMessage(input);
             }}
           >
-            <Input
+            <Textarea
               disabled={status === 'streaming' || status === 'submitted'}
-              onChange={(e) => setInput(e.target.value)}
+              onChange={handleInputChange}
+              onKeyDown={(e) => {
+                if (e.key === 'Enter' && !e.shiftKey) {
+                  e.preventDefault();
+                  validateAndSubmitMessage(input);
+                  // Reset height after submit
+                  if (e.currentTarget) {
+                    e.currentTarget.style.height = 'auto';
+                  }
+                }
+              }}
               placeholder="Ask me to create an automation..."
               value={input}
+              rows={1}
+              className="min-h-[36px] max-h-[200px] resize-none overflow-y-auto"
+              style={{ height: 'auto' }}
             />
           </form>
         </div>
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/chat/EmptyState.tsx b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/chat/EmptyState.tsx
index 864ea49cc..db61533ef 100644
--- a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/chat/EmptyState.tsx
+++ b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/chat/EmptyState.tsx
@@ -1,14 +1,15 @@
 import { Card, CardDescription, CardHeader } from '@comp/ui/card';
 import Image from 'next/image';
-import { Input } from '../../components/ui/input';
+import { Textarea } from '../../components/ui/textarea';
 import { AUTOMATION_EXAMPLES, AutomationExample } from '../../constants/automation-examples';
 
 interface EmptyStateProps {
   input: string;
-  onInputChange: (value: string) => void;
+  onInputChange: (e: React.ChangeEvent<HTMLTextAreaElement>) => void;
   onExampleClick: (prompt: string) => void;
   status: string;
-  inputRef: React.RefObject<HTMLInputElement | null>;
+  inputRef: React.RefObject<HTMLTextAreaElement | null>;
+  onSubmit: () => void;
 }
 
 export function EmptyState({
@@ -17,6 +18,7 @@ export function EmptyState({
   onExampleClick,
   status,
   inputRef,
+  onSubmit,
 }: EmptyStateProps) {
   return (
     <div className="flex-1 min-h-0 overflow-y-auto h-full z-20">
@@ -25,13 +27,30 @@ export function EmptyState({
           <p className="text-2xl font-medium text-primary tracking-wide z-20">
             What evidence do you want to collect?
           </p>
-          <Input
+          <Textarea
             ref={inputRef}
             placeholder="Check if GitHub dependabot is enabled and tell me the result"
-            className="w-full max-w-3xl transition-all duration-200 hover:shadow-md hover:shadow-primary/5 focus:shadow-lg focus:shadow-primary/10 focus:ring-2 focus:ring-primary/30"
+            className="w-full max-w-3xl transition-all duration-200 hover:shadow-md hover:shadow-primary/5 focus:shadow-lg focus:shadow-primary/10 focus:ring-2 focus:ring-primary/30 min-h-[44px] max-h-[200px] resize-none overflow-y-auto"
             value={input}
-            onChange={(e) => onInputChange(e.target.value)}
+            onChange={(e) => {
+              onInputChange(e);
+              // Auto-resize
+              e.target.style.height = 'auto';
+              e.target.style.height = `${e.target.scrollHeight}px`;
+            }}
+            onKeyDown={(e) => {
+              if (e.key === 'Enter' && !e.shiftKey) {
+                e.preventDefault();
+                onSubmit();
+                // Reset height after submit
+                if (e.currentTarget) {
+                  e.currentTarget.style.height = 'auto';
+                }
+              }
+            }}
             disabled={status === 'streaming' || status === 'submitted'}
+            rows={1}
+            style={{ height: 'auto' }}
           />
         </div>
 
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/evaluation/EvaluationCriteriaCard.tsx b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/evaluation/EvaluationCriteriaCard.tsx
new file mode 100644
index 000000000..f582a20a4
--- /dev/null
+++ b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/evaluation/EvaluationCriteriaCard.tsx
@@ -0,0 +1,146 @@
+'use client';
+
+import { Button } from '@comp/ui/button';
+import { Textarea } from '@comp/ui/textarea';
+import { Save } from 'lucide-react';
+import { useState } from 'react';
+import { toast } from 'sonner';
+import { updateEvaluationCriteria } from '../../actions/task-automation-actions';
+
+interface EvaluationCriteriaCardProps {
+  automationId: string;
+  initialCriteria?: string;
+  isAiGenerated?: boolean;
+}
+
+export function EvaluationCriteriaCard({
+  automationId,
+  initialCriteria,
+}: EvaluationCriteriaCardProps) {
+  const [isEditing, setIsEditing] = useState(false);
+  const [criteria, setCriteria] = useState(initialCriteria || '');
+  const [isSaving, setIsSaving] = useState(false);
+
+  const handleSave = async () => {
+    setIsSaving(true);
+    try {
+      const result = await updateEvaluationCriteria(automationId, criteria);
+      if (result.success) {
+        toast.success('Success criteria updated');
+        setIsEditing(false);
+      } else {
+        toast.error(result.error || 'Failed to update criteria');
+      }
+    } catch (error) {
+      toast.error('Failed to update criteria');
+    } finally {
+      setIsSaving(false);
+    }
+  };
+
+  const handleCancel = () => {
+    setCriteria(initialCriteria || '');
+    setIsEditing(false);
+  };
+
+  // Format inline code with chips
+  const formatCriteriaText = (text: string) => {
+    const parts = text.split(/(`[^`]+`)/g);
+    return parts.map((part, index) => {
+      if (part.startsWith('`') && part.endsWith('`')) {
+        const code = part.slice(1, -1);
+        return (
+          <code
+            key={index}
+            className="inline-flex items-center px-2 py-0.5 mx-0.5 rounded-md bg-primary/10 text-[13px] font-mono text-foreground border border-primary/20"
+          >
+            {code}
+          </code>
+        );
+      }
+      return <span key={index}>{part}</span>;
+    });
+  };
+
+  // Parse pass/fail conditions
+  const parseConditions = (text: string) => {
+    const lowerText = text.toLowerCase();
+    const hasPassCondition = lowerText.includes('pass') && lowerText.includes('if');
+    const hasFailCondition = lowerText.includes('fail') && lowerText.includes('if');
+
+    if (hasPassCondition || hasFailCondition) {
+      return { formatted: formatCriteriaText(text), hasStructure: true };
+    }
+    return { formatted: formatCriteriaText(text), hasStructure: false };
+  };
+
+  const { formatted, hasStructure } = criteria
+    ? parseConditions(criteria)
+    : { formatted: null, hasStructure: false };
+
+  return (
+    <div className="relative group">
+      {/* Main Card with subtle tint */}
+      <div className="rounded-xl bg-primary/5 border border-primary/10 p-5 transition-all hover:border-primary/20 hover:bg-primary/[0.07]">
+        {/* Header */}
+        <div className="flex items-center justify-between mb-4">
+          <div className="flex items-center gap-2">
+            <h3 className="text-sm font-semibold text-foreground">Success Criteria</h3>
+          </div>
+          {!isEditing && (
+            <button
+              onClick={() => setIsEditing(true)}
+              className="text-xs text-primary hover:text-primary/80 font-medium transition-colors"
+            >
+              Edit criteria
+            </button>
+          )}
+        </div>
+
+        {/* Body */}
+        {isEditing ? (
+          <div className="space-y-3">
+            <Textarea
+              value={criteria}
+              onChange={(e) => setCriteria(e.target.value)}
+              placeholder="Define when this automation passes or fails, e.g., 'dependabot is enabled'"
+              className="leading-relaxed text-sm bg-background"
+              rows={4}
+              disabled={isSaving}
+            />
+            <div className="flex items-center justify-end gap-2">
+              <Button
+                size="sm"
+                variant="ghost"
+                onClick={handleCancel}
+                disabled={isSaving}
+                className="h-8"
+              >
+                Cancel
+              </Button>
+              <Button size="sm" onClick={handleSave} disabled={isSaving} className="h-8">
+                <Save className="w-3.5 h-3.5 mr-1.5" />
+                Save
+              </Button>
+            </div>
+          </div>
+        ) : (
+          <div>
+            {criteria ? (
+              <div className="space-y-3">
+                <div className="flex items-start gap-2.5">
+                  <p className="text-sm leading-relaxed text-foreground flex-1">{formatted}</p>
+                </div>
+              </div>
+            ) : (
+              <p className="text-sm text-muted-foreground">
+                No success criteria defined yet. Click{' '}
+                <span className="text-primary font-medium">Edit criteria</span> to add one.
+              </p>
+            )}
+          </div>
+        )}
+      </div>
+    </div>
+  );
+}
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/workflow/components/TestResultsPanel.tsx b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/workflow/components/TestResultsPanel.tsx
index 8519b9243..e27f2a339 100644
--- a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/workflow/components/TestResultsPanel.tsx
+++ b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/workflow/components/TestResultsPanel.tsx
@@ -1,16 +1,11 @@
 'use client';
 
 import { cn } from '@/lib/utils';
-import {
-  AlertCircle,
-  ArrowLeft,
-  Bug,
-  CheckCircle2,
-  Loader2,
-  Sparkles,
-  Terminal,
-} from 'lucide-react';
+import { Button } from '@comp/ui/button';
+import { AlertCircle, CheckCircle2, CircleX, Loader2, Sparkles, X } from 'lucide-react';
 import { useEffect, useRef, useState } from 'react';
+import { Prism as SyntaxHighlighter } from 'react-syntax-highlighter';
+import { oneDark } from 'react-syntax-highlighter/dist/esm/styles/prism';
 import type { TestResult } from '../types';
 import { ConfettiEffect } from './ConfettiEffect';
 
@@ -19,27 +14,63 @@ interface Props {
   result: TestResult | null;
   onLetAIFix: () => void;
   onBack: () => void;
+  evaluationCriteria?: string;
 }
 
-export function TestResultsPanel({ isExecuting, result, onLetAIFix, onBack }: Props) {
-  const [showLogs, setShowLogs] = useState(false);
-  const [showOutput, setShowOutput] = useState(false);
+type ActiveSection = 'output' | 'logs' | 'reasoning' | null;
+
+export function TestResultsPanel({
+  isExecuting,
+  result,
+  onLetAIFix,
+  onBack,
+  evaluationCriteria,
+}: Props) {
+  const [activeSection, setActiveSection] = useState<ActiveSection>('reasoning');
   const [animateSuccess, setAnimateSuccess] = useState(false);
   const containerRef = useRef<HTMLDivElement>(null);
 
+  // Determine overall test state
+  const getTestState = () => {
+    if (!result) return null;
+
+    // Execution error - script failed to run
+    if (result.status === 'error') {
+      return {
+        type: 'execution-error',
+        title: '🚨 Execution Error',
+        color: 'destructive',
+      } as const;
+    }
+
+    // Script ran successfully
+    if (result.status === 'success') {
+      // Check evaluation if available
+      if (result.evaluationStatus === 'pass') {
+        return { type: 'pass', title: 'Test Passed', color: 'success' } as const;
+      } else if (result.evaluationStatus === 'fail') {
+        return { type: 'fail', title: 'Test Failed', color: 'destructive' } as const;
+      }
+      // No evaluation - just show execution success
+      return { type: 'success', title: '🎉 Execution Success', color: 'primary' } as const;
+    }
+
+    return null;
+  };
+
+  const testState = getTestState();
+
   useEffect(() => {
-    if (result?.status === 'success') {
+    if (testState?.type === 'pass' || testState?.type === 'success') {
       setAnimateSuccess(true);
       const timer = setTimeout(() => setAnimateSuccess(false), 2000);
       return () => clearTimeout(timer);
     }
-  }, [result?.status]);
+  }, [testState]);
 
   // Reset states when results change
   useEffect(() => {
     if (!result && !isExecuting) {
-      setShowLogs(false);
-      setShowOutput(false);
       setAnimateSuccess(false);
     }
   }, [result, isExecuting]);
@@ -68,190 +99,231 @@ export function TestResultsPanel({ isExecuting, result, onLetAIFix, onBack }: Pr
 
   if (!result) return null;
 
+  if (!testState) return null;
+
+  const getColorClasses = () => {
+    switch (testState.color) {
+      case 'success':
+        return {
+          bg: 'bg-gradient-to-br from-green-500/5 via-green-500/10 to-green-500/5 border-green-500/20',
+          iconBg: 'bg-green-500',
+          iconGradient: 'from-green-500 to-green-600',
+          glow1: 'bg-gradient-to-br from-green-500/20 to-green-500/10',
+          glow2: 'bg-gradient-to-tr from-green-500/10 to-green-500/20',
+        };
+      case 'destructive':
+        return {
+          bg: 'bg-gradient-to-br from-destructive/5 via-destructive/10 to-destructive/5 border-destructive/20',
+          iconBg: 'bg-destructive',
+          iconGradient: 'from-destructive to-destructive/80',
+          glow1: 'bg-gradient-to-br from-destructive/20 to-destructive/10',
+          glow2: 'bg-gradient-to-tr from-destructive/10 to-destructive/20',
+        };
+      default:
+        return {
+          bg: 'bg-gradient-to-br from-primary/5 via-primary/10 to-primary/5 border-primary/20',
+          iconBg: 'bg-primary',
+          iconGradient: 'from-primary to-primary/80',
+          glow1: 'bg-gradient-to-br from-primary/20 to-primary/10',
+          glow2: 'bg-gradient-to-tr from-primary/10 to-primary/20',
+        };
+    }
+  };
+
+  const colors = getColorClasses();
+
   return (
-    <div ref={containerRef} className="h-full flex flex-col">
+    <div ref={containerRef} className="h-full flex flex-col p-8">
       {/* Confetti Effect */}
-      <ConfettiEffect trigger={result.status === 'success'} containerRef={containerRef} />
+      <ConfettiEffect trigger={testState.type === 'pass'} containerRef={containerRef} />
 
-      {/* Header */}
-      <div
-        className={cn(
-          'relative overflow-hidden border-b',
-          result.status === 'success'
-            ? 'bg-gradient-to-br from-primary/5 via-primary/10 to-primary/5 border-primary/20'
-            : 'bg-gradient-to-br from-destructive/5 via-destructive/10 to-destructive/5 border-destructive/20',
-        )}
-      >
-        {result.status === 'success' && (
-          <div className="absolute inset-0 overflow-hidden">
+      <div className="flex-1 flex flex-col items-center justify-center">
+        <div className="max-w-2xl mx-auto w-full">
+          <div className="relative overflow-hidden p-10 rounded-2xl bg-background border border-border shadow-xl">
+            {/* Decorative gradient */}
             <div
-              className={cn(
-                'absolute -top-20 -right-20 w-40 h-40 rounded-full bg-gradient-to-br from-primary/20 to-primary/10 blur-3xl',
-                animateSuccess && 'animate-pulse',
-              )}
+              className={`absolute -top-12 -right-12 w-40 h-40 rounded-full blur-3xl opacity-10 ${
+                testState.type === 'pass' ? 'bg-green-500' : 'bg-destructive'
+              }`}
             />
-            <div className="absolute -bottom-20 -left-20 w-40 h-40 rounded-full bg-gradient-to-tr from-primary/10 to-primary/20 blur-3xl" />
-          </div>
-        )}
-        <div className="relative px-8 py-6">
-          <div className="flex items-center gap-4">
-            <div
-              className={cn(
-                'relative transition-transform duration-500',
-                animateSuccess && 'animate-[bounce_1.5s_ease-in-out]',
-              )}
-            >
-              {result.status === 'success' ? (
-                <div className="relative">
-                  <div className="absolute inset-0 bg-primary rounded-full blur-md opacity-20" />
-                  <div className="relative inline-flex items-center justify-center w-12 h-12 rounded-full bg-gradient-to-br from-primary to-primary/80 shadow-lg">
-                    <CheckCircle2 className="w-6 h-6 text-primary-foreground" />
-                  </div>
+
+            <div className="relative space-y-8">
+              {/* Close button at top */}
+              <div className="flex justify-end -mt-2 mb-4">
+                <Button onClick={onBack} variant="outline" size="sm">
+                  <X className="w-4 h-4 mr-1" />
+                  Close
+                </Button>
+              </div>
+
+              {/* Hero Result */}
+              <div className="text-center">
+                <div
+                  className={cn('inline-flex items-center justify-center w-20 h-20 rounded-2xl')}
+                >
+                  {testState.type === 'execution-error' ? (
+                    <AlertCircle className="w-10 h-10 text-destructive" />
+                  ) : testState.type === 'pass' ? (
+                    <CheckCircle2 className="w-10 h-10 text-green-600 dark:text-green-500" />
+                  ) : testState.type === 'fail' ? (
+                    <CircleX className="w-10 h-10 text-destructive" />
+                  ) : (
+                    <CheckCircle2 className="w-10 h-10 text-primary" />
+                  )}
                 </div>
-              ) : (
-                <div className="relative">
-                  <div className="absolute inset-0 bg-destructive rounded-full blur-md opacity-20" />
-                  <div className="relative inline-flex items-center justify-center w-12 h-12 rounded-full bg-gradient-to-br from-destructive to-destructive/80 shadow-lg">
-                    <AlertCircle className="w-6 h-6 text-destructive-foreground" />
-                  </div>
+                <div>
+                  <h3 className="text-2xl font-semibold text-foreground">
+                    {testState.type === 'pass'
+                      ? 'Everything looks good'
+                      : testState.type === 'execution-error'
+                        ? 'Something went wrong'
+                        : testState.type === 'fail'
+                          ? 'Criteria not met'
+                          : 'Test completed'}
+                  </h3>
+                  <p className="text-sm text-muted-foreground mt-2">
+                    {testState.type === 'execution-error'
+                      ? 'The automation encountered an error during execution.'
+                      : testState.type === 'fail'
+                        ? 'The automation ran but did not meet success criteria.'
+                        : testState.type === 'pass'
+                          ? 'The automation ran and met all success criteria.'
+                          : 'The automation executed without errors.'}
+                  </p>
                 </div>
-              )}
-            </div>
-            <div className="flex-1">
-              <h3 className="text-xl font-semibold text-foreground">
-                {result.status === 'success' ? '🎉 Success!' : '🚨 Error!'}
-              </h3>
-              <p className="mt-1 text-sm text-muted-foreground">
-                {result.status === 'success'
-                  ? 'Your automation ran successfully without any errors.'
-                  : 'There was an issue running your automation. Please check the output and logs below to understand what went wrong.'}
-              </p>
-            </div>
-            <button
-              onClick={onBack}
-              className="flex items-center gap-2 px-3 py-2 rounded-lg bg-background/60 border border-border hover:bg-background/80 transition-all text-sm text-muted-foreground hover:text-foreground backdrop-blur-sm"
-            >
-              <ArrowLeft className="w-4 h-4" />
-              Back
-            </button>
-          </div>
-        </div>
-      </div>
-
-      <div className="flex-1 bg-muted/10 overflow-hidden flex flex-col">
-        {/* Default Summary View */}
-        {!showOutput && !showLogs && (
-          <div className="flex-1 flex flex-col items-center justify-center px-8 py-12">
-            <div className="text-center max-w-md">
-              <h3 className="text-lg font-semibold mb-4">
-                {result.status === 'success' ? 'Test completed successfully' : 'Test failed'}
-              </h3>
+              </div>
 
-              {/* Show summary or error here if available */}
-              {(result.summary || result.error) && (
-                <div className="mb-6 p-4 bg-muted/50 rounded-lg text-sm">
-                  {result.summary || result.error}
+              {/* Error Details */}
+              {testState.type === 'execution-error' && result.error && (
+                <div className="p-4 bg-destructive/5 rounded-xl border border-destructive/20 text-left">
+                  <p className="text-xs font-semibold text-muted-foreground mb-2">Error Details</p>
+                  <p className="text-sm leading-relaxed text-foreground">{result.error}</p>
                 </div>
               )}
 
-              <p className="text-sm text-muted-foreground mb-8">
-                {result.status === 'success'
-                  ? 'View the output to see the results.'
-                  : 'Check the output and logs below to understand what went wrong.'}
-              </p>
-
-              {/* Quick Actions */}
-              <div className="flex gap-2 justify-center">
-                <button
-                  onClick={() => setShowOutput(true)}
-                  className="group flex items-center gap-2 px-4 py-2.5 rounded-lg transition-all bg-primary/5 hover:bg-primary/10 border border-primary/20 hover:border-primary/30"
-                >
-                  <Terminal className="w-4 h-4 text-primary/70 group-hover:text-primary transition-colors" />
-                  <span className="text-sm font-medium text-primary">View Output</span>
-                </button>
-
-                {result.logs && result.logs.length > 0 && (
+              {/* Sub-nav */}
+              <div className="flex items-center justify-center gap-3 text-xs mb-4">
+                {result.evaluationReason && evaluationCriteria && (
                   <button
-                    onClick={() => setShowLogs(true)}
-                    className="group flex items-center gap-2 px-4 py-2.5 rounded-lg transition-all bg-primary/5 hover:bg-primary/10 border border-primary/20 hover:border-primary/30"
+                    onClick={() =>
+                      setActiveSection(activeSection === 'reasoning' ? null : 'reasoning')
+                    }
+                    className={`text-muted-foreground hover:text-foreground transition-colors ${activeSection === 'reasoning' ? 'font-medium underline underline-offset-4' : ''}`}
                   >
-                    <Bug className="w-4 h-4 text-primary/70 group-hover:text-primary transition-colors" />
-                    <span className="text-sm font-medium text-primary">View Logs</span>
+                    Reasoning
                   </button>
                 )}
-              </div>
-            </div>
-          </div>
-        )}
-
-        {/* Detail Views - Redesigned as expandable sections */}
-        {(showOutput || showLogs) && (
-          <div className="flex-1 overflow-hidden flex flex-col">
-            {/* Navigation Header */}
-            <div className="flex-shrink-0 px-6 py-4 bg-background/30 border-b">
-              <div className="flex items-center gap-4">
+                {result.evaluationReason && evaluationCriteria && (
+                  <span className="text-border">|</span>
+                )}
                 <button
-                  onClick={() => {
-                    setShowOutput(false);
-                    setShowLogs(false);
-                  }}
-                  className="flex items-center gap-2 px-3 py-1.5 rounded-lg bg-primary/5 border border-primary/20 hover:bg-primary/10 transition-colors text-sm text-primary font-medium"
+                  onClick={() => setActiveSection(activeSection === 'output' ? null : 'output')}
+                  className={`text-muted-foreground hover:text-foreground transition-colors ${activeSection === 'output' ? 'font-medium underline underline-offset-4' : ''}`}
                 >
-                  <ArrowLeft className="w-3.5 h-3.5" />
-                  Back to Summary
+                  Output
                 </button>
-                <div className="h-4 w-px bg-border" />
-                <h4 className="text-sm font-semibold text-foreground flex items-center gap-2">
-                  {showOutput ? (
-                    <>
-                      <Terminal className="w-4 h-4 text-primary" />
-                      Execution Output
-                    </>
-                  ) : (
-                    <>
-                      <Bug className="w-4 h-4 text-primary" />
-                      System Logs
-                    </>
-                  )}
-                </h4>
+                {result.logs && result.logs.length > 0 && (
+                  <>
+                    <span className="text-border">|</span>
+                    <button
+                      onClick={() => setActiveSection(activeSection === 'logs' ? null : 'logs')}
+                      className={`text-muted-foreground hover:text-foreground transition-colors ${activeSection === 'logs' ? 'font-medium underline underline-offset-4' : ''}`}
+                    >
+                      Logs
+                    </button>
+                  </>
+                )}
               </div>
-            </div>
 
-            {/* Content */}
-            <div className="flex-1 overflow-y-auto p-6">
-              {/* Output Content */}
-              {showOutput && (
-                <pre className="p-4 bg-primary/5 rounded-lg text-xs leading-relaxed overflow-x-auto font-mono border border-primary/10 h-full">
-                  {result.data !== undefined && result.data !== null
-                    ? JSON.stringify(result.data, null, 2)
-                    : result.status === 'success'
-                      ? '// No output returned'
-                      : '// Execution failed'}
-                </pre>
-              )}
+              {/* Section Content - Grid for smooth height transitions */}
+              <div
+                className="grid transition-all duration-1000 ease-in-out"
+                style={{
+                  gridTemplateRows: activeSection ? '1fr' : '0fr',
+                }}
+              >
+                <div className="overflow-hidden">
+                  {activeSection === 'output' && (
+                    <div className="rounded-xl overflow-y-auto max-h-80 animate-in fade-in duration-300">
+                      <SyntaxHighlighter
+                        language="json"
+                        style={oneDark}
+                        customStyle={{
+                          margin: 0,
+                          padding: '16px',
+                          fontSize: '12px',
+                          lineHeight: '1.6',
+                        }}
+                        showLineNumbers
+                      >
+                        {result.data !== undefined && result.data !== null
+                          ? JSON.stringify(result.data, null, 2)
+                          : result.status === 'success'
+                            ? '// No output returned'
+                            : '// Execution failed'}
+                      </SyntaxHighlighter>
+                    </div>
+                  )}
+
+                  {activeSection === 'logs' && result.logs && result.logs.length > 0 && (
+                    <div className="rounded-xl overflow-y-auto max-h-80 border border-border animate-in fade-in duration-300">
+                      <SyntaxHighlighter
+                        language="bash"
+                        style={oneDark}
+                        customStyle={{
+                          margin: 0,
+                          padding: '16px',
+                          fontSize: '12px',
+                          lineHeight: '1.6',
+                        }}
+                        showLineNumbers
+                      >
+                        {result.logs.join('\n')}
+                      </SyntaxHighlighter>
+                    </div>
+                  )}
+
+                  {activeSection === 'reasoning' &&
+                    result.evaluationReason &&
+                    evaluationCriteria && (
+                      <div className="space-y-3 text-left animate-in fade-in duration-300">
+                        <div>
+                          <p className="text-xs font-semibold text-muted-foreground mb-1">
+                            Criteria
+                          </p>
+                          <p className="text-xs leading-relaxed text-foreground">
+                            {evaluationCriteria}
+                          </p>
+                        </div>
+                        <div>
+                          <p className="text-xs font-semibold text-muted-foreground mb-1">
+                            Reasoning
+                          </p>
+                          <p className="text-xs leading-relaxed text-foreground">
+                            {result.evaluationReason}
+                          </p>
+                        </div>
+                      </div>
+                    )}
+                </div>
+              </div>
 
-              {/* Logs Content */}
-              {showLogs && result.logs && result.logs.length > 0 && (
-                <pre className="p-4 bg-primary/5 rounded-lg text-xs leading-relaxed overflow-x-auto font-mono text-muted-foreground border border-primary/10 h-full">
-                  {result.logs.join('\n')}
-                </pre>
+              {/* AI Fix Button */}
+              {testState.type === 'execution-error' && !activeSection && (
+                <div className="mt-6">
+                  <button
+                    onClick={onLetAIFix}
+                    className="w-full flex items-center justify-center gap-2 px-6 py-3 rounded-lg bg-gradient-to-r from-primary to-primary/80 text-primary-foreground font-medium shadow-lg hover:shadow-xl transition-all hover:scale-[1.02] active:scale-[0.98]"
+                  >
+                    <Sparkles className="w-4 h-4" />
+                    Let AI Fix This
+                  </button>
+                </div>
               )}
             </div>
           </div>
-        )}
-      </div>
-
-      {result.status === 'error' && (
-        <div className="px-8 pb-6 pt-2">
-          <button
-            onClick={onLetAIFix}
-            className="w-full flex items-center justify-center gap-2 px-6 py-3 rounded-lg bg-gradient-to-r from-primary to-primary/80 text-primary-foreground font-medium shadow-lg hover:shadow-xl transition-all hover:scale-[1.02] active:scale-[0.98]"
-          >
-            <Sparkles className="w-4 h-4" />
-            Let AI Fix This
-          </button>
         </div>
-      )}
+      </div>
     </div>
   );
 }
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/workflow/components/UnifiedWorkflowCard.tsx b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/workflow/components/UnifiedWorkflowCard.tsx
index 54d5d8cf3..ab5c048f9 100644
--- a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/workflow/components/UnifiedWorkflowCard.tsx
+++ b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/workflow/components/UnifiedWorkflowCard.tsx
@@ -4,6 +4,7 @@ import { Card, CardContent, CardHeader, CardTitle } from '@comp/ui/card';
 import { Loader2, Play, Zap } from 'lucide-react';
 import Image from 'next/image';
 import { useEffect, useState } from 'react';
+import { EvaluationCriteriaCard } from '../../evaluation/EvaluationCriteriaCard';
 
 interface WorkflowStep {
   id: string;
@@ -29,9 +30,18 @@ interface Props {
   integrationsUsed: {
     link: string;
   }[];
+  evaluationCriteria?: string;
+  automationId?: string;
 }
 
-export function UnifiedWorkflowCard({ steps, title, onTest, integrationsUsed }: Props) {
+export function UnifiedWorkflowCard({
+  steps,
+  title,
+  onTest,
+  integrationsUsed,
+  evaluationCriteria,
+  automationId,
+}: Props) {
   const [isAnimationComplete, setIsAnimationComplete] = useState(false);
 
   useEffect(() => {
@@ -129,6 +139,20 @@ export function UnifiedWorkflowCard({ steps, title, onTest, integrationsUsed }:
           </CardContent>
         </Card>
       </CardContent>
+
+      {/* Evaluation Criteria Section */}
+      {evaluationCriteria !== undefined && automationId && isAnimationComplete && (
+        <div className="px-4 pb-4 pt-2">
+          <div className="max-w-[650px] mx-auto">
+            <EvaluationCriteriaCard
+              automationId={automationId}
+              initialCriteria={evaluationCriteria}
+              isAiGenerated={!!evaluationCriteria}
+            />
+          </div>
+        </div>
+      )}
+
       <div
         className={`rounded-b-xl p-4 w-full border-0 border-t border-border transition-colors duration-500 ${
           !isAnimationComplete ? 'bg-blue-100' : 'bg-secondary'
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/workflow/types.ts b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/workflow/types.ts
index 0c0635337..4da9b0487 100644
--- a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/workflow/types.ts
+++ b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/workflow/types.ts
@@ -5,4 +5,6 @@ export type TestResult = {
   logs?: string[];
   error?: string;
   summary?: string;
+  evaluationStatus?: 'pass' | 'fail';
+  evaluationReason?: string;
 };
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/workflow/workflow-visualizer-simple.tsx b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/workflow/workflow-visualizer-simple.tsx
index 7da44e667..2d6311637 100644
--- a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/workflow/workflow-visualizer-simple.tsx
+++ b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/workflow/workflow-visualizer-simple.tsx
@@ -63,7 +63,7 @@ export function WorkflowVisualizerSimple({ className }: Props) {
   const [publishDialogOpen, setPublishDialogOpen] = useState(false);
   const [isRestoring, setIsRestoring] = useState(false);
   const [confirmRestore, setConfirmRestore] = useState<EvidenceAutomationVersion | null>(null);
-  const { automation } = useTaskAutomation();
+  const { automation, mutate: mutateAutomation } = useTaskAutomation();
   const { versions } = useAutomationVersions();
 
   // Update shared ref when automation is loaded from hook
@@ -105,10 +105,14 @@ export function WorkflowVisualizerSimple({ className }: Props) {
   };
 
   useEffect(() => {
-    const handleScriptSaved = () => refresh();
+    const handleScriptSaved = () => {
+      refresh();
+      // Also refresh automation data to get updated evaluationCriteria
+      mutateAutomation();
+    };
     window.addEventListener('task-automation:script-saved', handleScriptSaved);
     return () => window.removeEventListener('task-automation:script-saved', handleScriptSaved);
-  }, [refresh]);
+  }, [refresh, mutateAutomation]);
 
   useEffect(() => {
     if (script && !scriptGenerated) {
@@ -156,6 +160,8 @@ export function WorkflowVisualizerSimple({ className }: Props) {
         logs: executionResult.logs,
         error: executionResult.error || (hasErrorInData ? executionResult.data.error : undefined),
         summary: (executionResult as any).summary,
+        evaluationStatus: executionResult.evaluationStatus,
+        evaluationReason: executionResult.evaluationReason,
       };
     }
     return null;
@@ -299,6 +305,7 @@ Please fix the automation script to resolve this error.`;
             result={testResult}
             onLetAIFix={handleLetAIFix}
             onBack={() => resetExecution()}
+            evaluationCriteria={automation?.evaluationCriteria}
           />
         ) : (
           /* Regular Content - Only show when NOT testing */
@@ -308,21 +315,29 @@ Please fix the automation script to resolve this error.`;
               viewMode === 'visual' && 'p-8 flex justify-center items-center',
             )}
           >
-            <div className={cn(viewMode === 'visual' && 'max-w-3xl mx-auto')}>
+            <div
+              className={cn(
+                viewMode === 'visual' && 'max-w-3xl mx-auto w-full flex flex-col gap-6',
+              )}
+            >
               {viewMode === 'visual' ? (
                 // Visual Mode
-                showLoading ? (
-                  <WorkflowSkeleton />
-                ) : steps.length > 0 ? (
-                  <UnifiedWorkflowCard
-                    steps={steps}
-                    title={title || 'Automation Workflow'}
-                    onTest={handleTest}
-                    integrationsUsed={integrationsUsed || []}
-                  />
-                ) : (
-                  <EmptyState type="workflow" />
-                )
+                <>
+                  {showLoading ? (
+                    <WorkflowSkeleton />
+                  ) : steps.length > 0 ? (
+                    <UnifiedWorkflowCard
+                      steps={steps}
+                      title={title || 'Automation Workflow'}
+                      onTest={handleTest}
+                      integrationsUsed={integrationsUsed || []}
+                      evaluationCriteria={automation?.evaluationCriteria}
+                      automationId={automation?.id}
+                    />
+                  ) : (
+                    <EmptyState type="workflow" />
+                  )}
+                </>
               ) : (
                 // Code Mode
                 <div className="h-full">
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/hooks/use-task-automation-execution.ts b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/hooks/use-task-automation-execution.ts
index 21e0563db..a356701ed 100644
--- a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/hooks/use-task-automation-execution.ts
+++ b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/hooks/use-task-automation-execution.ts
@@ -66,6 +66,8 @@ export function useTaskAutomationExecution({
             error: data.output.error,
             logs: data.output.logs,
             summary: data.output.summary,
+            evaluationStatus: data.output.evaluationStatus,
+            evaluationReason: data.output.evaluationReason,
             taskId: data.id,
           };
 
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/hooks/use-task-automation.ts b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/hooks/use-task-automation.ts
index 66d9eb540..a0d5e6cb3 100644
--- a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/hooks/use-task-automation.ts
+++ b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/hooks/use-task-automation.ts
@@ -11,6 +11,8 @@ interface TaskAutomationData {
   status: string;
   createdAt: string;
   updatedAt: string;
+  evaluationCriteria?: string;
+  isEnabled: boolean;
 }
 
 interface UseTaskAutomationReturn {
@@ -47,8 +49,10 @@ export function useTaskAutomation(): UseTaskAutomationReturn {
       return response.data.automation;
     },
     {
-      revalidateOnFocus: false,
+      revalidateOnFocus: true,
       revalidateOnReconnect: true,
+      revalidateIfStale: true,
+      dedupingInterval: 2000,
       shouldRetryOnError: (error) => {
         // Don't retry on 404s
         return !error?.message?.includes('404');
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/lib/types/index.ts b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/lib/types/index.ts
index 8c7e2bb72..7482e67d7 100644
--- a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/lib/types/index.ts
+++ b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/lib/types/index.ts
@@ -36,6 +36,8 @@ export interface TaskAutomationExecutionResult {
   taskId?: string;
   modelName?: string;
   summary?: string;
+  evaluationStatus?: 'pass' | 'fail';
+  evaluationReason?: string;
 }
 
 export interface TaskAutomationTestResult {
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automations/[automationId]/overview/components/AutomationOverview.tsx b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automations/[automationId]/overview/components/AutomationOverview.tsx
index 2056ed6a9..1d05c5609 100644
--- a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automations/[automationId]/overview/components/AutomationOverview.tsx
+++ b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automations/[automationId]/overview/components/AutomationOverview.tsx
@@ -1,5 +1,6 @@
 'use client';
 
+import { api } from '@/lib/api-client';
 import {
   Breadcrumb,
   BreadcrumbItem,
@@ -15,16 +16,15 @@ import {
   DropdownMenuItem,
   DropdownMenuTrigger,
 } from '@comp/ui/dropdown-menu';
+import { Textarea } from '@comp/ui/textarea';
 import { EvidenceAutomation, EvidenceAutomationRun, EvidenceAutomationVersion, Task } from '@db';
-import { ChevronRight, Edit, FileText, MoreVertical, Trash2, Type } from 'lucide-react';
+import { ChevronRight, MoreVertical, Trash2 } from 'lucide-react';
 import Link from 'next/link';
 import { useParams } from 'next/navigation';
-import { useMemo, useState } from 'react';
-import {
-  DeleteAutomationDialog,
-  EditDescriptionDialog,
-  EditNameDialog,
-} from '../../../../automation/[automationId]/components/AutomationSettingsDialogs';
+import { useMemo, useRef, useState } from 'react';
+import { toast } from 'sonner';
+import { toggleAutomationEnabled } from '../../../../automation/[automationId]/actions/task-automation-actions';
+import { DeleteAutomationDialog } from '../../../../automation/[automationId]/components/AutomationSettingsDialogs';
 import { useTaskAutomation } from '../../../../automation/[automationId]/hooks/use-task-automation';
 import { AutomationRunsCard } from '../../../../components/AutomationRunsCard';
 import { MetricsSection } from './MetricsSection';
@@ -54,9 +54,11 @@ export function AutomationOverview({
     automationId: string;
   }>();
 
-  const [editNameOpen, setEditNameOpen] = useState(false);
-  const [editDescriptionOpen, setEditDescriptionOpen] = useState(false);
   const [deleteDialogOpen, setDeleteDialogOpen] = useState(false);
+  const [isTogglingEnabled, setIsTogglingEnabled] = useState(false);
+  const [editingDescription, setEditingDescription] = useState(false);
+  const [descriptionValue, setDescriptionValue] = useState('');
+  const descriptionInputRef = useRef<HTMLTextAreaElement>(null);
 
   // Use the automation hook to get live data and mutate function
   const { automation: liveAutomation, mutate: mutateAutomation } = useTaskAutomation();
@@ -64,6 +66,60 @@ export function AutomationOverview({
   // Use live data from hook if available, fallback to initial data
   const automation = liveAutomation || initialAutomation;
 
+  const handleToggleEnabled = async (enabled: boolean) => {
+    if (!automation?.id) return;
+
+    setIsTogglingEnabled(true);
+    try {
+      const result = await toggleAutomationEnabled(automation.id, enabled);
+
+      if (!result.success) {
+        throw new Error(result.error || 'Failed to toggle automation');
+      }
+
+      toast.success(enabled ? 'Automation enabled' : 'Automation disabled');
+      await mutateAutomation();
+    } catch (error) {
+      toast.error(error instanceof Error ? error.message : 'Failed to toggle automation');
+      console.error('Error toggling automation:', error);
+    } finally {
+      setIsTogglingEnabled(false);
+    }
+  };
+
+  const handleDescriptionEdit = () => {
+    setDescriptionValue(automation.description || '');
+    setEditingDescription(true);
+    setTimeout(() => descriptionInputRef.current?.focus(), 0);
+  };
+
+  const saveDescriptionEdit = async () => {
+    if (descriptionValue === (automation.description || '')) {
+      setEditingDescription(false);
+      return;
+    }
+
+    try {
+      const response = await api.patch(
+        `/v1/tasks/${taskId}/automations/${automationId}`,
+        { description: descriptionValue.trim() || null },
+        orgId,
+      );
+
+      if (response.error) {
+        throw new Error(response.error);
+      }
+
+      await mutateAutomation();
+      toast.success('Description updated');
+      setEditingDescription(false);
+    } catch (error) {
+      toast.error('Failed to update description');
+      setDescriptionValue(automation.description || '');
+      setEditingDescription(false);
+    }
+  };
+
   // Transform runs to include automation name
   const runsWithName = useMemo(
     () =>
@@ -121,6 +177,10 @@ export function AutomationOverview({
         automationName={automation.name}
         initialVersions={initialVersions}
         initialRuns={initialRuns}
+        isEnabled={automation.isEnabled}
+        onToggleEnabled={handleToggleEnabled}
+        isTogglingEnabled={isTogglingEnabled}
+        editScriptUrl={`/${orgId}/tasks/${taskId}/automation/${automationId}`}
       />
 
       {/* Main Content - 2 Column Layout */}
@@ -136,53 +196,54 @@ export function AutomationOverview({
             <CardHeader>
               <div className="flex items-center justify-between">
                 <CardTitle className="text-base font-medium">Details</CardTitle>
-                <div className="flex items-center gap-2">
-                  <Link href={`/${orgId}/tasks/${taskId}/automation/${automationId}`}>
-                    <Button size="sm">
-                      <Edit className="h-4 w-4 mr-2" />
-                      Edit
+                <DropdownMenu>
+                  <DropdownMenuTrigger asChild>
+                    <Button variant="outline" size="sm">
+                      <MoreVertical className="h-4 w-4" />
                     </Button>
-                  </Link>
-                  <DropdownMenu>
-                    <DropdownMenuTrigger asChild>
-                      <Button variant="outline" size="sm">
-                        <MoreVertical className="h-4 w-4" />
-                      </Button>
-                    </DropdownMenuTrigger>
-                    <DropdownMenuContent align="end">
-                      <DropdownMenuItem onClick={() => setEditNameOpen(true)}>
-                        <Type className="h-4 w-4 mr-2" />
-                        Edit Name
-                      </DropdownMenuItem>
-                      <DropdownMenuItem onClick={() => setEditDescriptionOpen(true)}>
-                        <FileText className="h-4 w-4 mr-2" />
-                        Edit Description
-                      </DropdownMenuItem>
-                      <DropdownMenuItem
-                        onClick={() => setDeleteDialogOpen(true)}
-                        className="text-destructive focus:text-destructive"
-                      >
-                        <Trash2 className="h-4 w-4 mr-2" />
-                        Delete
-                      </DropdownMenuItem>
-                    </DropdownMenuContent>
-                  </DropdownMenu>
-                </div>
+                  </DropdownMenuTrigger>
+                  <DropdownMenuContent align="end">
+                    <DropdownMenuItem
+                      onClick={() => setDeleteDialogOpen(true)}
+                      className="text-destructive focus:text-destructive"
+                    >
+                      <Trash2 className="h-4 w-4 mr-2" />
+                      Delete Automation
+                    </DropdownMenuItem>
+                  </DropdownMenuContent>
+                </DropdownMenu>
               </div>
             </CardHeader>
             <CardContent>
               <div className="flex flex-col gap-4">
-                <div className="flex flex-col gap-1">
-                  <p className="text-xs font-medium text-muted-foreground">Name</p>
-                  <p className="text-sm font-medium">{automation.name}</p>
-                </div>
-                <div className="flex flex-col gap-1">
+                <div className="flex flex-col gap-1 group">
                   <p className="text-xs font-medium text-muted-foreground">Description</p>
-                  <p className="text-sm">
-                    {automation.description || (
-                      <span className="text-muted-foreground">No description</span>
-                    )}
-                  </p>
+                  {editingDescription ? (
+                    <Textarea
+                      ref={descriptionInputRef}
+                      value={descriptionValue}
+                      onChange={(e) => setDescriptionValue(e.target.value)}
+                      onBlur={saveDescriptionEdit}
+                      onKeyDown={(e) => {
+                        if (e.key === 'Escape') {
+                          setEditingDescription(false);
+                        }
+                      }}
+                      className="text-sm min-h-[60px]"
+                      rows={3}
+                    />
+                  ) : (
+                    <p
+                      onClick={handleDescriptionEdit}
+                      className="text-sm cursor-pointer rounded-md px-2 py-1 -mx-2 -my-1 hover:bg-muted/50 transition-colors min-h-[24px]"
+                    >
+                      {automation.description || (
+                        <span className="text-muted-foreground italic">
+                          Click to add description
+                        </span>
+                      )}
+                    </p>
+                  )}
                 </div>
                 <div className="flex flex-col gap-1">
                   <p className="text-xs font-medium text-muted-foreground">Created</p>
@@ -225,22 +286,9 @@ export function AutomationOverview({
               </div>
             </CardContent>
           </Card>
-
-          {/* <VersionsCard /> */}
         </div>
       </div>
 
-      {/* Settings Dialogs */}
-      <EditNameDialog
-        open={editNameOpen}
-        onOpenChange={setEditNameOpen}
-        onSuccess={mutateAutomation}
-      />
-      <EditDescriptionDialog
-        open={editDescriptionOpen}
-        onOpenChange={setEditDescriptionOpen}
-        onSuccess={mutateAutomation}
-      />
       <DeleteAutomationDialog
         open={deleteDialogOpen}
         onOpenChange={setDeleteDialogOpen}
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automations/[automationId]/overview/components/MetricsSection.tsx b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automations/[automationId]/overview/components/MetricsSection.tsx
index 712b50fc8..c2afef968 100644
--- a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automations/[automationId]/overview/components/MetricsSection.tsx
+++ b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automations/[automationId]/overview/components/MetricsSection.tsx
@@ -1,85 +1,140 @@
 'use client';
 
+import { api } from '@/lib/api-client';
+import { Button } from '@comp/ui/button';
 import { Card, CardContent } from '@comp/ui/card';
-import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@comp/ui/select';
+import { Input } from '@comp/ui/input';
+import { Switch } from '@comp/ui/switch';
 import { EvidenceAutomationRun, EvidenceAutomationVersion } from '@db';
-import { Clock } from 'lucide-react';
-import { useMemo, useState } from 'react';
-import { useAutomationVersions } from '../../../../automation/[automationId]/hooks/use-automation-versions';
+import { Clock, Code2 } from 'lucide-react';
+import Link from 'next/link';
+import { useParams } from 'next/navigation';
+import { useMemo, useRef, useState } from 'react';
+import { toast } from 'sonner';
+import { useTaskAutomation } from '../../../../automation/[automationId]/hooks/use-task-automation';
 
 interface MetricsSectionProps {
   automationName: string;
   initialVersions: EvidenceAutomationVersion[];
   initialRuns: EvidenceAutomationRun[];
+  isEnabled: boolean;
+  onToggleEnabled: (enabled: boolean) => void;
+  isTogglingEnabled: boolean;
+  editScriptUrl: string;
 }
 
 export function MetricsSection({
   automationName,
   initialVersions,
   initialRuns,
+  isEnabled,
+  onToggleEnabled,
+  isTogglingEnabled,
+  editScriptUrl,
 }: MetricsSectionProps) {
-  const {
-    versions,
-    hasMore,
-    loadMore,
-    isLoading: loadingVersions,
-  } = useAutomationVersions({
-    initialData: initialVersions,
-  });
-
-  // Initialize with latest version or draft (no loading flicker)
-  const [selectedVersion, setSelectedVersion] = useState<string>(
-    initialVersions.length > 0 ? initialVersions[0].version.toString() : 'draft',
-  );
+  const { orgId, taskId, automationId } = useParams<{
+    orgId: string;
+    taskId: string;
+    automationId: string;
+  }>();
+
+  const [editingName, setEditingName] = useState(false);
+  const [nameValue, setNameValue] = useState('');
+  const nameInputRef = useRef<HTMLInputElement>(null);
+  const { mutate: mutateAutomation } = useTaskAutomation();
 
-  // Filter runs by selected version
-  const filteredRuns = useMemo(() => {
-    if (selectedVersion === 'draft') {
-      return initialRuns.filter((run) => run.version === null);
+  // Get latest published version runs only
+  const latestVersionNumber = initialVersions.length > 0 ? initialVersions[0].version : null;
+
+  const latestVersionRuns = useMemo(() => {
+    if (!latestVersionNumber) {
+      return initialRuns;
     }
-    return initialRuns.filter((run) => run.version === parseInt(selectedVersion));
-  }, [selectedVersion, initialRuns]);
+    return initialRuns.filter((run) => run.version === latestVersionNumber);
+  }, [latestVersionNumber, initialRuns]);
 
-  // Calculate metrics from filtered runs
-  const totalRuns = filteredRuns.length;
-  const successfulRuns = filteredRuns.filter((run) => run.status === 'completed').length;
+  // Calculate metrics from latest version runs
+  const totalRuns = latestVersionRuns.length;
+  const successfulRuns = latestVersionRuns.filter((run) => run.status === 'completed').length;
   const successRate = totalRuns > 0 ? Math.round((successfulRuns / totalRuns) * 100) : 0;
-  const latestRun = filteredRuns[0];
+  const latestRun = latestVersionRuns[0];
+
+  const handleNameEdit = () => {
+    setNameValue(automationName);
+    setEditingName(true);
+    setTimeout(() => nameInputRef.current?.focus(), 0);
+  };
+
+  const saveNameEdit = async () => {
+    if (!nameValue.trim() || nameValue === automationName) {
+      setEditingName(false);
+      return;
+    }
+
+    try {
+      const response = await api.patch(
+        `/v1/tasks/${taskId}/automations/${automationId}`,
+        { name: nameValue.trim() },
+        orgId,
+      );
+
+      if (response.error) {
+        throw new Error(response.error);
+      }
+
+      await mutateAutomation();
+      toast.success('Name updated');
+      setEditingName(false);
+    } catch (error) {
+      toast.error('Failed to update name');
+      setNameValue(automationName);
+      setEditingName(false);
+    }
+  };
 
   return (
     <div className="flex flex-col gap-6 bg-secondary p-8">
       <div className="flex items-center justify-between">
-        <div className="text-xl font-medium">{automationName}</div>
-        <Select value={selectedVersion} onValueChange={setSelectedVersion}>
-          <SelectTrigger className="w-[180px]">
-            <SelectValue placeholder="Select version" />
-          </SelectTrigger>
-          <SelectContent className="max-h-[300px]">
-            <div className="max-h-[200px] overflow-y-auto">
-              {versions?.map((version, index) => (
-                <SelectItem key={version.id} value={version.version.toString()}>
-                  Version {version.version} {index === 0 ? '(Latest)' : ''}
-                </SelectItem>
-              ))}
-
-              {hasMore && (
-                <div
-                  className="relative flex cursor-pointer select-none items-center rounded-sm px-2 py-1.5 text-sm outline-none hover:bg-accent hover:text-accent-foreground"
-                  onClick={(e) => {
-                    e.stopPropagation();
-                    loadMore();
-                  }}
-                >
-                  <span className="text-muted-foreground">
-                    {loadingVersions ? 'Loading...' : 'Load 10 more...'}
-                  </span>
-                </div>
-              )}
-            </div>
-
-            <SelectItem value="draft">Draft</SelectItem>
-          </SelectContent>
-        </Select>
+        {editingName ? (
+          <Input
+            ref={nameInputRef}
+            value={nameValue}
+            onChange={(e) => setNameValue(e.target.value)}
+            onBlur={saveNameEdit}
+            onKeyDown={(e) => {
+              if (e.key === 'Enter') {
+                saveNameEdit();
+              } else if (e.key === 'Escape') {
+                setEditingName(false);
+              }
+            }}
+            className="text-xl font-medium max-w-md"
+          />
+        ) : (
+          <div
+            onClick={handleNameEdit}
+            className="group/title text-xl font-medium cursor-pointer rounded-md px-2 py-1 -mx-2 -my-1 hover:bg-background/80 hover:border hover:border-border transition-all inline-flex items-center gap-2"
+          >
+            <span>{automationName}</span>
+          </div>
+        )}
+        <div className="flex items-center gap-3">
+          <div className="flex items-center gap-2">
+            <span className="text-xs font-medium">{isEnabled ? 'Enabled' : 'Disabled'}</span>
+            <Switch
+              checked={isEnabled}
+              onCheckedChange={onToggleEnabled}
+              disabled={isTogglingEnabled}
+              className="scale-90"
+            />
+            <Link href={editScriptUrl}>
+              <Button size="sm">
+                <Code2 className="h-4 w-4 mr-2" />
+                Edit Script
+              </Button>
+            </Link>
+          </div>
+        </div>
       </div>
 
       <div className="grid grid-cols-1 md:grid-cols-4 gap-4">
@@ -140,6 +195,12 @@ export function MetricsSection({
           </CardContent>
         </Card>
       </div>
+
+      {latestVersionNumber && (
+        <span className="text-xs text-muted-foreground w-fit">
+          Metrics shown for version {latestVersionNumber}
+        </span>
+      )}
     </div>
   );
 }
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/components/AutomationRunsCard.tsx b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/components/AutomationRunsCard.tsx
index 2903599e4..8852ded3e 100644
--- a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/components/AutomationRunsCard.tsx
+++ b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/components/AutomationRunsCard.tsx
@@ -182,6 +182,19 @@ export function AutomationRunsCard({ runs }: AutomationRunsCardProps) {
                               <span className={`font-medium ${styles.text}`}>
                                 {run.status.charAt(0).toUpperCase() + run.status.slice(1)}
                               </span>
+                              {run.evaluationStatus && (
+                                <>
+                                  <span className="text-[10px]">•</span>
+                                  <Badge
+                                    variant={
+                                      run.evaluationStatus === 'pass' ? 'default' : 'destructive'
+                                    }
+                                    className="text-[10px] px-1.5 py-0"
+                                  >
+                                    {run.evaluationStatus === 'pass' ? '✓ Pass' : '✗ Fail'}
+                                  </Badge>
+                                </>
+                              )}
                               <span className="text-[10px]">•</span>
                               <span>{timeAgo}</span>
                               {run.triggeredBy && (
@@ -203,6 +216,18 @@ export function AutomationRunsCard({ runs }: AutomationRunsCardProps) {
                       >
                         <div className="overflow-hidden">
                           <div className="px-4 pb-3 pt-3 space-y-3 border-t border-border/50">
+                            {/* Evaluation Reason */}
+                            {run.evaluationReason && (
+                              <div className="space-y-1.5">
+                                <div className="flex items-center">
+                                  <p className="text-xs font-medium">Evaluation</p>
+                                </div>
+                                <p className="text-xs text-foreground leading-relaxed">
+                                  {run.evaluationReason}
+                                </p>
+                              </div>
+                            )}
+
                             {/* Logs */}
                             {run.logs && (
                               <div className="space-y-1">
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/components/TaskAutomations.tsx b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/components/TaskAutomations.tsx
index 770847b52..8a4675af6 100644
--- a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/components/TaskAutomations.tsx
+++ b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/components/TaskAutomations.tsx
@@ -68,6 +68,16 @@ export const TaskAutomations = ({ automations }: { automations: AutomationWithLa
                 : null;
               const runVersion = latestVersionRun?.version;
 
+              // Determine dot color: red if failed, primary if enabled, gray if disabled
+              const hasFailed =
+                latestVersionRun &&
+                (runStatus === 'failed' || latestVersionRun.evaluationStatus === 'fail');
+              const dotColor = hasFailed
+                ? 'bg-destructive'
+                : automation.isEnabled
+                  ? 'bg-green-500'
+                  : 'bg-gray-400';
+
               return (
                 <Link
                   href={`/${orgId}/tasks/${taskId}/automations/${automation.id}/overview`}
@@ -80,19 +90,7 @@ export const TaskAutomations = ({ automations }: { automations: AutomationWithLa
                 >
                   <div className="flex-1 min-w-0">
                     <div className="flex items-center gap-2">
-                      <div
-                        className={`h-2 w-2 rounded-full flex-shrink-0 ${
-                          !latestVersionRun
-                            ? 'bg-muted-foreground/30'
-                            : runStatus === 'completed'
-                              ? 'bg-chart-positive'
-                              : runStatus === 'failed'
-                                ? 'bg-chart-destructive'
-                                : runStatus === 'running'
-                                  ? 'bg-chart-other animate-pulse'
-                                  : 'bg-chart-neutral'
-                        }`}
-                      />
+                      <div className={`h-2 w-2 rounded-full flex-shrink-0 ${dotColor}`} />
                       <p className="font-medium text-foreground text-xs">{automation.name}</p>
                     </div>
                     {latestVersionRun && lastRan ? (
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/components/constants.ts b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/components/constants.ts
index 40fba4180..c2a1481f7 100644
--- a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/components/constants.ts
+++ b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/components/constants.ts
@@ -1,7 +1,7 @@
 import { Departments, TaskFrequency, TaskStatus } from '@db';
 
 // Define possible statuses based on the Prisma schema
-export const taskStatuses: TaskStatus[] = ['todo', 'in_progress', 'done', 'not_relevant'];
+export const taskStatuses: TaskStatus[] = Object.values(TaskStatus);
 
 // Define possible frequencies
 export const taskFrequencies: TaskFrequency[] = [
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/actions/updateTaskStatus.ts b/apps/app/src/app/(app)/[orgId]/tasks/actions/updateTaskStatus.ts
index 6f88ee2ba..7ea952f6b 100644
--- a/apps/app/src/app/(app)/[orgId]/tasks/actions/updateTaskStatus.ts
+++ b/apps/app/src/app/(app)/[orgId]/tasks/actions/updateTaskStatus.ts
@@ -1,13 +1,13 @@
 'use server';
 
 import { authActionClient } from '@/actions/safe-action';
-import { db } from '@db';
+import { db, TaskStatus } from '@db';
 import { revalidatePath } from 'next/cache';
 import { z } from 'zod';
 
 const updateTaskStatusSchema = z.object({
   id: z.string(),
-  status: z.enum(['todo', 'in_progress', 'done', 'not_relevant']),
+  status: z.nativeEnum(TaskStatus),
 });
 
 export const updateTaskStatusAction = authActionClient
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/components/TaskStatusIndicator.tsx b/apps/app/src/app/(app)/[orgId]/tasks/components/TaskStatusIndicator.tsx
index bf5755521..48327a356 100644
--- a/apps/app/src/app/(app)/[orgId]/tasks/components/TaskStatusIndicator.tsx
+++ b/apps/app/src/app/(app)/[orgId]/tasks/components/TaskStatusIndicator.tsx
@@ -1,7 +1,7 @@
 import { STATUS_COLORS } from '@/components/status-indicator';
 import { cn } from '@comp/ui/cn';
 import type { TaskStatus } from '@db';
-import { Check, Circle, CircleX, Loader2 } from 'lucide-react';
+import { Check, Circle, CircleX, Loader2, X } from 'lucide-react';
 
 interface TaskStatusIndicatorProps {
   status: TaskStatus;
@@ -27,6 +27,8 @@ function getStatusColorClasses(status: TaskStatus): string {
       return 'border-[#ffc107] bg-[#ffc107]/10'; // Yellowish
     case 'done':
       return 'border-[#fff] bg-[#fff]/10'; // Greenish
+    case 'failed':
+      return 'border-[#ff0000] bg-[#ff0000]/10'; // Redish
     default:
       return 'border-[#6b7280] bg-[#6b7280]/10'; // Default Grayish
   }
@@ -41,6 +43,7 @@ export function TaskStatusIndicator({ status, className }: TaskStatusIndicatorPr
       {status === 'in_progress' && <Loader2 className="size-4 text-[#ffc107]" strokeWidth={1.5} />}
       {status === 'done' && <Check className="size-4" strokeWidth={1.5} />}
       {status === 'not_relevant' && <CircleX className="size-4 text-[#ff0000]" strokeWidth={1.5} />}
+      {status === 'failed' && <X className="size-4 text-destructive" strokeWidth={1.5} />}
     </div>
   );
 }
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/components/TaskStatusSelector.tsx b/apps/app/src/app/(app)/[orgId]/tasks/components/TaskStatusSelector.tsx
index 77853e00b..9b339fd30 100644
--- a/apps/app/src/app/(app)/[orgId]/tasks/components/TaskStatusSelector.tsx
+++ b/apps/app/src/app/(app)/[orgId]/tasks/components/TaskStatusSelector.tsx
@@ -31,11 +31,11 @@ export function TaskStatusSelector({ task }: TaskStatusSelectorProps) {
 
   const isUpdating = status === 'executing';
 
-  const handleStatusSelect = (selectedStatus: string | null) => {
+  const handleStatusSelect = (selectedStatus: TaskStatus | null) => {
     if (selectedStatus && selectedStatus !== task.status) {
       execute({
         id: task.id,
-        status: selectedStatus as TaskStatus,
+        status: selectedStatus,
       });
     }
   };
@@ -51,7 +51,9 @@ export function TaskStatusSelector({ task }: TaskStatusSelectorProps) {
           <span className="capitalize">{status.replace('_', ' ')}</span>
         </div>
       )}
-      onSelect={handleStatusSelect}
+      onSelect={(selectedValue) => {
+        handleStatusSelect(selectedValue as TaskStatus);
+      }}
       trigger={
         <Button
           variant="ghost"
diff --git a/apps/app/src/components/status-indicator.tsx b/apps/app/src/components/status-indicator.tsx
index f8960e20d..90be1ed3c 100644
--- a/apps/app/src/components/status-indicator.tsx
+++ b/apps/app/src/components/status-indicator.tsx
@@ -24,6 +24,7 @@ export const STATUS_TYPES = [
   'todo',
   'done',
   'not_relevant',
+  'failed',
 ] as const;
 
 export type StatusType = (typeof STATUS_TYPES)[number];
@@ -52,6 +53,9 @@ export const STATUS_COLORS: Record<StatusType, string> = {
   needs_review: 'bg-red-600 dark:bg-red-400',
   not_started: 'bg-red-600 dark:bg-red-400',
   not_relevant: 'bg-red-600 dark:bg-red-400',
+
+  // Failed - Red
+  failed: 'bg-red-600 dark:bg-red-400',
 } as const;
 
 // Updated status translation mapping
diff --git a/apps/app/trigger.config.ts b/apps/app/trigger.config.ts
index 2841b3a7e..5e0bdddae 100644
--- a/apps/app/trigger.config.ts
+++ b/apps/app/trigger.config.ts
@@ -13,7 +13,7 @@ export default defineConfig({
     extensions: [
       prismaExtension({
         version: '6.13.0',
-        dbPackageVersion: '^1.3.7', // Version of @trycompai/db package with compiled JS
+        dbPackageVersion: '^1.3.15', // Version of @trycompai/db package with compiled JS
       }),
       puppeteer(),
       syncVercelEnvVars(),
diff --git a/packages/db/.env.example b/packages/db/.env.example
index 1792de902..c3a171e48 100644
--- a/packages/db/.env.example
+++ b/packages/db/.env.example
@@ -1,2 +1,2 @@
 # Database connection URL for local development
-DATABASE_URL="" # Format: "postgresql://postgres:pass@127.0.0.1:5432/comp"
+DATABASE_URL="" # Format: "postgresql://postgres:pass@127.0.0.1:5432/comp"
\ No newline at end of file
diff --git a/packages/db/package.json b/packages/db/package.json
index 76ab37b83..0c4fb1b5f 100644
--- a/packages/db/package.json
+++ b/packages/db/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@trycompai/db",
   "description": "Database package with Prisma client and schema for Comp AI",
-  "version": "1.3.13",
+  "version": "1.3.15",
   "dependencies": {
     "@prisma/client": "^6.13.0",
     "dotenv": "^16.4.5"
diff --git a/packages/db/prisma/migrations/20251021174901_add_automation_evaluation_fields/migration.sql b/packages/db/prisma/migrations/20251021174901_add_automation_evaluation_fields/migration.sql
new file mode 100644
index 000000000..1a4b3188d
--- /dev/null
+++ b/packages/db/prisma/migrations/20251021174901_add_automation_evaluation_fields/migration.sql
@@ -0,0 +1,9 @@
+-- CreateEnum
+CREATE TYPE "public"."EvidenceAutomationEvaluationStatus" AS ENUM ('pass', 'fail');
+
+-- AlterTable
+ALTER TABLE "public"."EvidenceAutomation" ADD COLUMN     "evaluationCriteria" TEXT;
+
+-- AlterTable
+ALTER TABLE "public"."EvidenceAutomationRun" ADD COLUMN     "evaluationReason" TEXT,
+ADD COLUMN     "evaluationStatus" "public"."EvidenceAutomationEvaluationStatus";
diff --git a/packages/db/prisma/migrations/20251022132716_add_is_enabled_column_to_evidence_automations/migration.sql b/packages/db/prisma/migrations/20251022132716_add_is_enabled_column_to_evidence_automations/migration.sql
new file mode 100644
index 000000000..46cb119c5
--- /dev/null
+++ b/packages/db/prisma/migrations/20251022132716_add_is_enabled_column_to_evidence_automations/migration.sql
@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "public"."EvidenceAutomation" ADD COLUMN     "isEnabled" BOOLEAN NOT NULL DEFAULT false;
diff --git a/packages/db/prisma/migrations/20251022164236_add_failed_status_to_task/migration.sql b/packages/db/prisma/migrations/20251022164236_add_failed_status_to_task/migration.sql
new file mode 100644
index 000000000..f162d360d
--- /dev/null
+++ b/packages/db/prisma/migrations/20251022164236_add_failed_status_to_task/migration.sql
@@ -0,0 +1,2 @@
+-- AlterEnum
+ALTER TYPE "public"."TaskStatus" ADD VALUE 'failed';
diff --git a/packages/db/prisma/schema/automation-run.prisma b/packages/db/prisma/schema/automation-run.prisma
index a0d1bb122..bdf0e45e5 100644
--- a/packages/db/prisma/schema/automation-run.prisma
+++ b/packages/db/prisma/schema/automation-run.prisma
@@ -18,6 +18,10 @@ model EvidenceAutomationRun {
     logs    Json?
     output  Json?
 
+    // Evaluation
+    evaluationStatus EvidenceAutomationEvaluationStatus?
+    evaluationReason String?
+
     // Metadata
     triggeredBy EvidenceAutomationTrigger @default(scheduled)
     runDuration Int? // in milliseconds
@@ -44,3 +48,8 @@ enum EvidenceAutomationTrigger {
     scheduled
     api
 }
+
+enum EvidenceAutomationEvaluationStatus {
+    pass
+    fail
+}
diff --git a/packages/db/prisma/schema/automation.prisma b/packages/db/prisma/schema/automation.prisma
index f1f918042..f8d5fd721 100644
--- a/packages/db/prisma/schema/automation.prisma
+++ b/packages/db/prisma/schema/automation.prisma
@@ -3,8 +3,10 @@ model EvidenceAutomation {
     name        String
     description String?
     createdAt   DateTime @default(now())
+    isEnabled   Boolean  @default(false)
 
-    chatHistory String?
+    chatHistory        String?
+    evaluationCriteria String?
 
     taskId String
     task   Task   @relation(fields: [taskId], references: [id], onDelete: Cascade)
diff --git a/packages/db/prisma/schema/task.prisma b/packages/db/prisma/schema/task.prisma
index d8173e7ea..d55f782c0 100644
--- a/packages/db/prisma/schema/task.prisma
+++ b/packages/db/prisma/schema/task.prisma
@@ -34,6 +34,7 @@ enum TaskStatus {
     in_progress
     done
     not_relevant
+    failed
 }
 
 enum TaskFrequency {

From d4f0cbe838c3f1d7e79e225dc175fe0a0a741091 Mon Sep 17 00:00:00 2001
From: Mariano Fuentes <marfuen98@gmail.com>
Date: Mon, 27 Oct 2025 19:18:04 -0400
Subject: [PATCH 4/4] refactor(tasks): remove feature flag for task automation
 display (#1696)

---
 .../[orgId]/tasks/[taskId]/components/SingleTask.tsx   | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/components/SingleTask.tsx b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/components/SingleTask.tsx
index ab6518fed..c1b108919 100644
--- a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/components/SingleTask.tsx
+++ b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/components/SingleTask.tsx
@@ -22,7 +22,6 @@ import {
 } from '@db';
 import { RefreshCw, Trash2 } from 'lucide-react';
 import { useAction } from 'next-safe-action/hooks';
-import { useFeatureFlagEnabled } from 'posthog-js/react';
 import { useState } from 'react';
 import { toast } from 'sonner';
 import { Comments } from '../../../../../../components/comments/Comments';
@@ -56,7 +55,6 @@ export function SingleTask({ initialTask, initialAutomations }: SingleTaskProps)
   const { automations } = useTaskAutomations({
     initialData: initialAutomations,
   });
-  const isTaskAutomationEnabled = useFeatureFlagEnabled('is-task-automation-enabled');
 
   const [deleteDialogOpen, setDeleteDialogOpen] = useState(false);
   const [isRegenerateConfirmOpen, setRegenerateConfirmOpen] = useState(false);
@@ -168,11 +166,9 @@ export function SingleTask({ initialTask, initialAutomations }: SingleTaskProps)
             </div>
           </Card>
           {/* Automations section */}
-          {isTaskAutomationEnabled && (
-            <Card className="border border-border bg-card shadow-sm overflow-hidden">
-              <TaskAutomations automations={automations || []} />
-            </Card>
-          )}
+          <Card className="border border-border bg-card shadow-sm overflow-hidden">
+            <TaskAutomations automations={automations || []} />
+          </Card>
         </div>
       </div>