From cbff0f9621e1f6c8354518087364880e6addea2b Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 14 Oct 2025 10:38:19 -0400
Subject: [PATCH 01/12] [dev] [Marfuen] mariano/more-10 (#1610)

* chore(automation): set default title and handle empty integrations in workflow visualizer

* chore: add ability to support multiple automations per task

* chore(automation): add update and delete functionality for task automations

* refactor(tasks): simplify task fetching and remove unused members logic

* chore(automation): implement automated evidence collection and related schema

* chore(docs): add fraud to risk category enum in openapi schema

* refactor(automation): remove organizationId from automation methods

* chore: cleanup and add automations

* feat(automation): enhance automation overview with latest runs and details

* chore: cleanup chat

* feat: added chat history

* refactor(chat): use ref for automationId to improve state management

* chore(automation): implement versioning for automation scripts with API endpoints

* chore: update bun lock

* chore: update UI

* chore(automation): update integrationsUsed type in UnifiedWorkflowCard

* chore(deps): add better-auth package and update TypeScript target

---------

Co-authored-by: Mariano Fuentes <marfuen98@gmail.com>
---
 .cursor/rules/design-system.mdc               |  70 +-
 ENTERPRISE_API_AUTOMATION_VERSIONING.md       | 184 +++++
 apps/api/package.json                         |   1 +
 apps/api/src/app.module.ts                    |   1 -
 .../src/automation/automation.controller.ts   |  59 ++
 apps/api/src/automation/automation.module.ts  |  11 +
 apps/api/src/automation/automation.service.ts |  64 ++
 .../dto/automation-error-responses.dto.ts     |  25 +
 .../dto/automation-responses.dto.ts           |  63 ++
 .../automation/dto/create-automation.dto.ts   |  12 +
 .../automation/dto/update-automation.dto.ts   |  22 +
 .../schemas/automation-operations.ts          |  11 +
 .../schemas/create-automation.responses.ts    |  71 ++
 .../schemas/update-automation.responses.ts    |  69 ++
 .../automations/automations.controller.ts     | 233 +++++++
 .../tasks/automations/automations.module.ts   |  13 +
 .../tasks/automations/automations.service.ts  | 156 +++++
 .../dto/automation-error-responses.dto.ts     |  25 +
 .../dto/automation-responses.dto.ts           |  63 ++
 .../automations/dto/create-automation.dto.ts  |  12 +
 .../automations/dto/update-automation.dto.ts  |  22 +
 .../schemas/automation-operations.ts          |  11 +
 .../schemas/create-automation.responses.ts    |  71 ++
 .../schemas/update-automation.responses.ts    |  69 ++
 apps/api/src/tasks/dto/task-responses.dto.ts  |   3 +-
 apps/api/src/tasks/tasks.controller.ts        |  63 ++
 apps/api/src/tasks/tasks.module.ts            |   3 +-
 apps/api/src/tasks/tasks.service.ts           |  38 +-
 apps/api/tsconfig.json                        |   2 +-
 apps/app/next.config.ts                       |   2 +-
 apps/app/package.json                         |   5 +-
 .../src/app/(app)/[orgId]/frameworks/page.tsx |   4 +
 .../[orgId]/people/[employeeId]/page.tsx      |   8 +-
 .../people/all/components/TeamMembers.tsx     |   8 +-
 .../actions/task-automation-actions.ts        | 151 ++++-
 .../automation-layout-wrapper.tsx             |   0
 .../automation/[automationId]/chat.tsx        | 147 ++++
 .../components/AutomationPageClient.tsx       |  19 +-
 .../components/AutomationSettingsDialogs.tsx  | 240 +++++++
 .../components/PublishDialog.tsx              |  94 +++
 .../components/ai-elements/conversation.tsx   |   0
 .../components/ai-elements/loader.tsx         |   0
 .../components/chat/ChatBreadcrumb.tsx        |  88 +++
 .../components/chat/EmptyState.tsx            |  71 ++
 .../components/chat/message-part/index.tsx    |   0
 .../chat/message-part/prompt-info.tsx         |  16 +-
 .../chat/message-part/prompt-secret.tsx       |  11 +-
 .../chat/message-part/reasoning.tsx           |   0
 .../chat/message-part/report-errors.tsx       |   0
 .../chat/message-part/research-activity.tsx   |   0
 .../components/chat/message-part/spinner.tsx  |   0
 .../components/chat/message-part/text.tsx     |   0
 .../components/chat/message-spinner.tsx       |   0
 .../components/chat/message.tsx               |   0
 .../components/chat/tool-header.tsx           |   0
 .../components/chat/tool-message.tsx          |   0
 .../components/chat/types.tsx                 |   0
 .../components/icons/github.tsx               |   0
 .../components/icons/vercel-dashed.tsx        |   0
 .../components/layout/panels.tsx              |   0
 .../components/layout/sizing.ts               |   0
 .../markdown-renderer/markdown-renderer.tsx   |   0
 .../model-selector/model-selector.tsx         |   0
 .../model-selector/use-available-models.tsx   |   0
 .../components/panels/panels.tsx              |   0
 .../components/preview/preview.tsx            |   0
 .../components/tabs/index.tsx                 |   0
 .../components/tabs/tab-content.tsx           |   0
 .../components/tabs/tab-item.tsx              |   0
 .../components/tabs/use-tab-state.ts          |   0
 .../components/ui/badge.tsx                   |   0
 .../components/ui/button.tsx                  |   0
 .../components/ui/checkbox.tsx                |   0
 .../components/ui/dialog.tsx                  |   0
 .../components/ui/input.tsx                   |   0
 .../components/ui/label.tsx                   |   0
 .../components/ui/popover.tsx                 |   0
 .../components/ui/scroll-area.tsx             |   0
 .../components/ui/select.tsx                  |   0
 .../components/ui/sonner.tsx                  |   0
 .../components/ui/textarea.tsx                |   0
 .../workflow/components/CodeViewer.tsx        |   0
 .../workflow/components/ConfettiEffect.tsx    |   0
 .../workflow/components/EmptyState.tsx        |   0
 .../workflow/components/TestDialog.tsx        |   0
 .../workflow/components/TestResultsPanel.tsx  |   0
 .../components/UnifiedWorkflowCard.tsx        |   5 +-
 .../workflow/components/ViewModeSwitch.tsx    |   0
 .../workflow/components/WorkflowSkeleton.tsx  |   0
 .../workflow/components/WorkflowStepCard.tsx  |   0
 .../components/workflow/components/index.ts   |   0
 .../components/workflow/types.ts              |   0
 .../components/workflow/workflow-loading.tsx  |   0
 .../workflow/workflow-visualizer-simple.tsx   | 157 ++++-
 .../constants/automation-examples.ts          |  33 +
 .../{ => [automationId]}/hooks/index.ts       |   2 +-
 .../hooks/use-automation-versions.ts          | 130 ++++
 .../[automationId]/hooks/use-chat-handlers.ts | 137 ++++
 .../hooks/use-task-automation-analyze.ts}     |  30 +-
 .../hooks/use-task-automation-execution.ts    |  16 +-
 .../hooks/use-task-automation-script.ts       |   3 +-
 .../hooks/use-task-automation.ts              |  66 ++
 .../{ => [automationId]}/layout.tsx           |   5 +-
 .../[automationId]/lib/chat-context.tsx       | 102 +++
 .../{ => [automationId]}/lib/deferred.ts      |   0
 .../{ => [automationId]}/lib/index.ts         |   0
 .../lib/is-relative-url.ts                    |   0
 .../lib/task-automation-api.ts                |   0
 .../lib/task-automation-store.ts              |   3 +-
 .../lib/types/data-parts.ts                   |   0
 .../{ => [automationId]}/lib/types/index.ts   |  24 +-
 .../lib/types/metadata.ts                     |   0
 .../automation/[automationId]/page.tsx        |  51 ++
 .../[automationId]/tools/exa-search.ts        |   9 +
 .../[automationId]/tools/firecrawl.ts         |   9 +
 .../{ => [automationId]}/tools/gateway.ts     |   0
 .../[automationId]/tools/prompt-for-info.ts   |  10 +
 .../[automationId]/tools/prompt-for-secret.ts |   9 +
 .../[automationId]/tools/store-to-s3.ts       |  11 +
 .../tools/task-automation-tools.ts            |   4 +-
 .../tasks/[taskId]/automation/chat.tsx        | 297 ---------
 .../[taskId]/automation/lib/chat-context.tsx  |  51 --
 .../tasks/[taskId]/automation/page.tsx        |  33 -
 .../[taskId]/automation/tools/exa-search.ts   | 144 ----
 .../[taskId]/automation/tools/firecrawl.ts    | 169 -----
 .../tools/generate-files/deferred.ts          |  24 -
 .../tools/generate-files/get-contents.ts      |  93 ---
 .../automation/tools/prompt-for-info.ts       |  45 --
 .../automation/tools/prompt-for-secret.ts     |  39 --
 .../[taskId]/automation/tools/store-to-s3.ts  | 134 ----
 .../components/AutomationOverview.tsx         | 187 ++++++
 .../overview/components/MetricsSection.tsx    | 145 ++++
 .../overview/components/VersionsCard.tsx      | 155 +++++
 .../[automationId]/overview/page.tsx          |  97 +++
 .../components/AutomationRunsCard.tsx         | 262 ++++++++
 .../tasks/[taskId]/components/SingleTask.tsx  |  99 ++-
 .../[taskId]/components/TaskAutomations.tsx   | 132 ++++
 .../tasks/[taskId]/components/TaskBody.tsx    |   4 +-
 .../components/TaskPropertiesSidebar.tsx      |  56 +-
 .../hooks/use-task-automation-runs.ts         |  64 ++
 .../[taskId]/hooks/use-task-automations.ts    |  62 ++
 .../[orgId]/tasks/[taskId]/hooks/use-task.ts  |  58 ++
 .../app/(app)/[orgId]/tasks/[taskId]/page.tsx |  48 +-
 .../(app)/[orgId]/tasks/actions/updateTask.ts |   1 +
 apps/app/src/app/api/auth/test-login/route.ts |  35 -
 apps/app/src/app/api/secrets/route.ts         |   2 +-
 .../app/src/hooks/use-organization-members.ts |  59 ++
 apps/app/src/lib/api-client.ts                |  21 +-
 bun.lock                                      |  92 ++-
 packages/db/package.json                      |   2 +-
 .../migration.sql                             |  57 ++
 .../migration.sql                             |   2 +
 .../migration.sql                             |  25 +
 .../migration.sql                             |   5 +
 .../db/prisma/schema/automation-run.prisma    |  46 ++
 .../prisma/schema/automation-version.prisma   |  19 +
 packages/db/prisma/schema/automation.prisma   |  17 +
 packages/db/prisma/schema/task.prisma         |  21 +-
 packages/docs/openapi.json                    | 628 ++++++++++++++++++
 159 files changed, 5225 insertions(+), 1332 deletions(-)
 create mode 100644 ENTERPRISE_API_AUTOMATION_VERSIONING.md
 create mode 100644 apps/api/src/automation/automation.controller.ts
 create mode 100644 apps/api/src/automation/automation.module.ts
 create mode 100644 apps/api/src/automation/automation.service.ts
 create mode 100644 apps/api/src/automation/dto/automation-error-responses.dto.ts
 create mode 100644 apps/api/src/automation/dto/automation-responses.dto.ts
 create mode 100644 apps/api/src/automation/dto/create-automation.dto.ts
 create mode 100644 apps/api/src/automation/dto/update-automation.dto.ts
 create mode 100644 apps/api/src/automation/schemas/automation-operations.ts
 create mode 100644 apps/api/src/automation/schemas/create-automation.responses.ts
 create mode 100644 apps/api/src/automation/schemas/update-automation.responses.ts
 create mode 100644 apps/api/src/tasks/automations/automations.controller.ts
 create mode 100644 apps/api/src/tasks/automations/automations.module.ts
 create mode 100644 apps/api/src/tasks/automations/automations.service.ts
 create mode 100644 apps/api/src/tasks/automations/dto/automation-error-responses.dto.ts
 create mode 100644 apps/api/src/tasks/automations/dto/automation-responses.dto.ts
 create mode 100644 apps/api/src/tasks/automations/dto/create-automation.dto.ts
 create mode 100644 apps/api/src/tasks/automations/dto/update-automation.dto.ts
 create mode 100644 apps/api/src/tasks/automations/schemas/automation-operations.ts
 create mode 100644 apps/api/src/tasks/automations/schemas/create-automation.responses.ts
 create mode 100644 apps/api/src/tasks/automations/schemas/update-automation.responses.ts
 rename apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/{ => [automationId]}/actions/task-automation-actions.ts (65%)
 rename apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/{ => [automationId]}/automation-layout-wrapper.tsx (100%)
 create mode 100644 apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/chat.tsx
 rename apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/{ => [automationId]}/components/AutomationPageClient.tsx (81%)
 create mode 100644 apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/AutomationSettingsDialogs.tsx
 create mode 100644 apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/PublishDialog.tsx
 rename apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/{ => [automationId]}/components/ai-elements/conversation.tsx (100%)
 rename apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/{ => [automationId]}/components/ai-elements/loader.tsx (100%)
 create mode 100644 apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/chat/ChatBreadcrumb.tsx
 create mode 100644 apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/chat/EmptyState.tsx
 rename apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/{ => [automationId]}/components/chat/message-part/index.tsx (100%)
 rename apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/{ => [automationId]}/components/chat/message-part/prompt-info.tsx (92%)
 rename apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/{ => [automationId]}/components/chat/message-part/prompt-secret.tsx (93%)
 rename apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/{ => [automationId]}/components/chat/message-part/reasoning.tsx (100%)
 rename apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/{ => [automationId]}/components/chat/message-part/report-errors.tsx (100%)
 rename apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/{ => [automationId]}/components/chat/message-part/research-activity.tsx (100%)
 rename apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/{ => [automationId]}/components/chat/message-part/spinner.tsx (100%)
 rename apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/{ => [automationId]}/components/chat/message-part/text.tsx (100%)
 rename apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/{ => [automationId]}/components/chat/message-spinner.tsx (100%)
 rename apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/{ => [automationId]}/components/chat/message.tsx (100%)
 rename apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/{ => [automationId]}/components/chat/tool-header.tsx (100%)
 rename apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/{ => [automationId]}/components/chat/tool-message.tsx (100%)
 rename apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/{ => [automationId]}/components/chat/types.tsx (100%)
 rename apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/{ => [automationId]}/components/icons/github.tsx (100%)
 rename apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/{ => [automationId]}/components/icons/vercel-dashed.tsx (100%)
 rename apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/{ => [automationId]}/components/layout/panels.tsx (100%)
 rename apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/{ => [automationId]}/components/layout/sizing.ts (100%)
 rename apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/{ => [automationId]}/components/markdown-renderer/markdown-renderer.tsx (100%)
 rename apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/{ => [automationId]}/components/model-selector/model-selector.tsx (100%)
 rename apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/{ => [automationId]}/components/model-selector/use-available-models.tsx (100%)
 rename apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/{ => [automationId]}/components/panels/panels.tsx (100%)
 rename apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/{ => [automationId]}/components/preview/preview.tsx (100%)
 rename apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/{ => [automationId]}/components/tabs/index.tsx (100%)
 rename apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/{ => [automationId]}/components/tabs/tab-content.tsx (100%)
 rename apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/{ => [automationId]}/components/tabs/tab-item.tsx (100%)
 rename apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/{ => [automationId]}/components/tabs/use-tab-state.ts (100%)
 rename apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/{ => [automationId]}/components/ui/badge.tsx (100%)
 rename apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/{ => [automationId]}/components/ui/button.tsx (100%)
 rename apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/{ => [automationId]}/components/ui/checkbox.tsx (100%)
 rename apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/{ => [automationId]}/components/ui/dialog.tsx (100%)
 rename apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/{ => [automationId]}/components/ui/input.tsx (100%)
 rename apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/{ => [automationId]}/components/ui/label.tsx (100%)
 rename apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/{ => [automationId]}/components/ui/popover.tsx (100%)
 rename apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/{ => [automationId]}/components/ui/scroll-area.tsx (100%)
 rename apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/{ => [automationId]}/components/ui/select.tsx (100%)
 rename apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/{ => [automationId]}/components/ui/sonner.tsx (100%)
 rename apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/{ => [automationId]}/components/ui/textarea.tsx (100%)
 rename apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/{ => [automationId]}/components/workflow/components/CodeViewer.tsx (100%)
 rename apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/{ => [automationId]}/components/workflow/components/ConfettiEffect.tsx (100%)
 rename apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/{ => [automationId]}/components/workflow/components/EmptyState.tsx (100%)
 rename apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/{ => [automationId]}/components/workflow/components/TestDialog.tsx (100%)
 rename apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/{ => [automationId]}/components/workflow/components/TestResultsPanel.tsx (100%)
 rename apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/{ => [automationId]}/components/workflow/components/UnifiedWorkflowCard.tsx (97%)
 rename apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/{ => [automationId]}/components/workflow/components/ViewModeSwitch.tsx (100%)
 rename apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/{ => [automationId]}/components/workflow/components/WorkflowSkeleton.tsx (100%)
 rename apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/{ => [automationId]}/components/workflow/components/WorkflowStepCard.tsx (100%)
 rename apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/{ => [automationId]}/components/workflow/components/index.ts (100%)
 rename apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/{ => [automationId]}/components/workflow/types.ts (100%)
 rename apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/{ => [automationId]}/components/workflow/workflow-loading.tsx (100%)
 rename apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/{ => [automationId]}/components/workflow/workflow-visualizer-simple.tsx (56%)
 create mode 100644 apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/constants/automation-examples.ts
 rename apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/{ => [automationId]}/hooks/index.ts (66%)
 create mode 100644 apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/hooks/use-automation-versions.ts
 create mode 100644 apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/hooks/use-chat-handlers.ts
 rename apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/{hooks/use-task-automation-workflow.ts => [automationId]/hooks/use-task-automation-analyze.ts} (79%)
 rename apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/{ => [automationId]}/hooks/use-task-automation-execution.ts (93%)
 rename apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/{ => [automationId]}/hooks/use-task-automation-script.ts (93%)
 create mode 100644 apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/hooks/use-task-automation.ts
 rename apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/{ => [automationId]}/layout.tsx (71%)
 create mode 100644 apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/lib/chat-context.tsx
 rename apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/{ => [automationId]}/lib/deferred.ts (100%)
 rename apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/{ => [automationId]}/lib/index.ts (100%)
 rename apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/{ => [automationId]}/lib/is-relative-url.ts (100%)
 rename apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/{ => [automationId]}/lib/task-automation-api.ts (100%)
 rename apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/{ => [automationId]}/lib/task-automation-store.ts (94%)
 rename apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/{ => [automationId]}/lib/types/data-parts.ts (100%)
 rename apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/{ => [automationId]}/lib/types/index.ts (88%)
 rename apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/{ => [automationId]}/lib/types/metadata.ts (100%)
 create mode 100644 apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/page.tsx
 create mode 100644 apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/tools/exa-search.ts
 create mode 100644 apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/tools/firecrawl.ts
 rename apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/{ => [automationId]}/tools/gateway.ts (100%)
 create mode 100644 apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/tools/prompt-for-info.ts
 create mode 100644 apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/tools/prompt-for-secret.ts
 create mode 100644 apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/tools/store-to-s3.ts
 rename apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/{ => [automationId]}/tools/task-automation-tools.ts (92%)
 delete mode 100644 apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/chat.tsx
 delete mode 100644 apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/lib/chat-context.tsx
 delete mode 100644 apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/page.tsx
 delete mode 100644 apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/tools/exa-search.ts
 delete mode 100644 apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/tools/firecrawl.ts
 delete mode 100644 apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/tools/generate-files/deferred.ts
 delete mode 100644 apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/tools/generate-files/get-contents.ts
 delete mode 100644 apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/tools/prompt-for-info.ts
 delete mode 100644 apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/tools/prompt-for-secret.ts
 delete mode 100644 apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/tools/store-to-s3.ts
 create mode 100644 apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automations/[automationId]/overview/components/AutomationOverview.tsx
 create mode 100644 apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automations/[automationId]/overview/components/MetricsSection.tsx
 create mode 100644 apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automations/[automationId]/overview/components/VersionsCard.tsx
 create mode 100644 apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automations/[automationId]/overview/page.tsx
 create mode 100644 apps/app/src/app/(app)/[orgId]/tasks/[taskId]/components/AutomationRunsCard.tsx
 create mode 100644 apps/app/src/app/(app)/[orgId]/tasks/[taskId]/components/TaskAutomations.tsx
 create mode 100644 apps/app/src/app/(app)/[orgId]/tasks/[taskId]/hooks/use-task-automation-runs.ts
 create mode 100644 apps/app/src/app/(app)/[orgId]/tasks/[taskId]/hooks/use-task-automations.ts
 create mode 100644 apps/app/src/app/(app)/[orgId]/tasks/[taskId]/hooks/use-task.ts
 create mode 100644 apps/app/src/hooks/use-organization-members.ts
 create mode 100644 packages/db/prisma/migrations/20251008175411_add_automations_tables/migration.sql
 create mode 100644 packages/db/prisma/migrations/20251009193556_add_chat_history/migration.sql
 create mode 100644 packages/db/prisma/migrations/20251010162752_add_automation_versions/migration.sql
 create mode 100644 packages/db/prisma/migrations/20251010174252_add_version_to_automation_runs/migration.sql
 create mode 100644 packages/db/prisma/schema/automation-run.prisma
 create mode 100644 packages/db/prisma/schema/automation-version.prisma
 create mode 100644 packages/db/prisma/schema/automation.prisma

diff --git a/.cursor/rules/design-system.mdc b/.cursor/rules/design-system.mdc
index c754e1479..9a0d82de5 100644
--- a/.cursor/rules/design-system.mdc
+++ b/.cursor/rules/design-system.mdc
@@ -1,6 +1,5 @@
 ---
-description: 
-globs: *.tsx
+description: Any time we are going to write react components and / or layouts
 alwaysApply: false
 ---
 
@@ -28,10 +27,77 @@ Design System & Component Guidelines
 
 ## Layout & Spacing
 
+- **Flexbox-First**: ALWAYS prefer flexbox with `gap` over hardcoded margins (`mt-`, `mb-`, `ml-`, `mr-`)
+- **Use Gaps, Not Margins**: Use `gap-2`, `gap-4`, `space-y-4` for spacing between elements
 - **Consistent Spacing**: Use standard Tailwind spacing scale (`space-y-4`, `gap-6`, etc.)
 - **Card-Based Layouts**: Prefer Card components for content organization
 - **Minimal Padding**: Use conservative padding - `p-3`, `p-4` rather than larger values
 - **Clean Separators**: Use subtle borders (`border-t`, `border-muted`) instead of heavy dividers
+- **NEVER Hardcode Margins**: Avoid `mt-4`, `mb-2`, `ml-3` unless absolutely necessary for exceptions
+
+## Color & Visual Elements
+
+- **Status Colors**:
+  - Green for completed/success states
+  - Blue for in-progress/info states
+  - Yellow for warnings
+  - Red for errors/destructive actions
+- **Subtle Indicators**: Use small colored dots (`w-2 h-2 rounded-full`) instead of large icons for status
+- **Minimal Shadows**: Prefer `hover:shadow-sm` over heavy shadow effects
+- **Progress Bars**: Keep thin (`h-1`, `h-2`) for minimal visual weight
+
+## Interactive Elements
+
+- **Subtle Hover States**: Use gentle transitions (`transition-shadow`, `hover:shadow-sm`)
+- **Consistent Button Sizing**: Prefer `size="sm"` for most buttons, `size="icon"` for icon-only
+- **Badge Usage**: Keep badges minimal with essential info only (percentages, short status)
+
+## Data Display
+
+- **Shared Design Language**: Ensure related components (cards, overviews, details) use consistent patterns
+- **Minimal Stats**: Present data cleanly without excessive decoration
+- **Contextual Icons**: Use small, relevant icons (`h-3 w-3`, `h-4 w-4`) sparingly for context
+
+## Anti-Patterns to Avoid
+
+- Large text sizes (`text-2xl+` except for main headings)
+- Heavy shadows or borders
+- Excessive use of colored backgrounds
+- Redundant badges or status indicators
+- Complex custom styling overrides
+- Non-semantic color usage (hardcoded hex values)
+- Cluttered layouts with too many visual elements
+  Rule Name: design-system
+  Description:
+  Design System & Component Guidelines
+
+## Design Philosophy
+
+- **B2B, Modern, Flat, Minimal, Elegant**: All UI should follow a clean, professional aesthetic suitable for business applications
+- **Sleek & Minimal**: Avoid visual clutter, use whitespace effectively, keep interfaces clean
+- **Dark Mode First**: Always ensure components work seamlessly in both light and dark modes
+
+## Component Usage
+
+- **Adhere to Base Components**: Minimize custom overrides and stick to shadcn/ui base components whenever possible
+- **Semantic Color Classes**: Use semantic classes like `text-muted-foreground`, `bg-muted/50` instead of hardcoded colors
+- **Dark Mode Support**: Always use dark mode variants like `bg-green-50 dark:bg-green-950/20`, `text-green-600 dark:text-green-400`
+
+## Typography & Sizing
+
+- **Moderate Text Sizes**: Avoid overly large text - prefer `text-base`, `text-sm`, `text-xs` over `text-xl+`
+- **Consistent Hierarchy**: Use `font-medium`, `font-semibold` sparingly, prefer `font-normal` with size differentiation
+- **Tabular Numbers**: Use `tabular-nums` class for numeric data to ensure proper alignment
+
+## Layout & Spacing
+
+- **Flexbox-First**: ALWAYS prefer flexbox with `gap` over hardcoded margins (`mt-`, `mb-`, `ml-`, `mr-`)
+- **Use Gaps, Not Margins**: Use `gap-2`, `gap-4`, `space-y-4` for spacing between elements
+- **Consistent Spacing**: Use standard Tailwind spacing scale (`space-y-4`, `gap-6`, etc.)
+- **Card-Based Layouts**: Prefer Card components for content organization
+- **Minimal Padding**: Use conservative padding - `p-3`, `p-4` rather than larger values
+- **Clean Separators**: Use subtle borders (`border-t`, `border-muted`) instead of heavy dividers
+- **NEVER Hardcode Margins**: Avoid `mt-4`, `mb-2`, `ml-3` unless absolutely necessary for exceptions
 
 ## Color & Visual Elements
 
diff --git a/ENTERPRISE_API_AUTOMATION_VERSIONING.md b/ENTERPRISE_API_AUTOMATION_VERSIONING.md
new file mode 100644
index 000000000..4b0a56c01
--- /dev/null
+++ b/ENTERPRISE_API_AUTOMATION_VERSIONING.md
@@ -0,0 +1,184 @@
+# Enterprise API - Automation Versioning Endpoints
+
+## Overview
+
+Implement versioning for automation scripts. The Next.js app handles database operations (storing version metadata), while the Enterprise API handles S3 operations (copying/managing script files) and Redis operations (chat history).
+
+## Context
+
+### Current S3 Structure
+
+- **Draft script**: `{orgId}/{taskId}/{automationId}.automation.js`
+- Scripts are stored in S3 via the enterprise API
+
+### New S3 Structure for Versions
+
+- **Draft script**: `{orgId}/{taskId}/{automationId}.draft.js`
+- **Published versions**: `{orgId}/{taskId}/{automationId}.v{version}.js`
+
+**Migration Note**: Existing scripts at `{automationId}.automation.js` should be moved to `{automationId}.draft.js`
+
+### Database (handled by Next.js app)
+
+- `EvidenceAutomationVersion` table stores version metadata
+- Next.js app creates version records after enterprise API copies files
+
+## Endpoints to Implement
+
+### 1. Publish Draft Script
+
+**Endpoint**: `POST /api/tasks-automations/publish`
+
+**Purpose**: Create a new version by copying current draft script to a versioned S3 key.
+
+**Request Body**:
+
+```typescript
+{
+  orgId: string;
+  taskId: string;
+  automationId: string;
+}
+```
+
+**Process**:
+
+1. Construct draft S3 key: `{orgId}/{taskId}/{automationId}.draft.js`
+2. Check if draft script exists in S3
+3. If not found, return error: `{ success: false, error: 'No draft script found to publish' }`
+4. Query database to get the next version number:
+   - Find highest existing version for this `automationId`
+   - Increment by 1 (or start at 1 if no versions exist)
+5. Construct version S3 key: `{orgId}/{taskId}/{automationId}.v{nextVersion}.js`
+6. Copy draft script to version key in S3
+7. Return success with the version number and scriptKey
+
+**Response**:
+
+```typescript
+{
+  success: boolean;
+  version?: number;   // e.g., 1, 2, 3
+  scriptKey?: string; // e.g., "org_xxx/tsk_xxx/aut_xxx.v1.js"
+  error?: string;
+}
+```
+
+**Note**: Enterprise API determines the version number server-side by querying the database, not from client input. This prevents version conflicts.
+
+**Error Cases**:
+
+- Draft script not found in S3
+- S3 copy operation fails
+- Invalid orgId/taskId/automationId
+
+---
+
+### 2. Restore Version to Draft
+
+**Endpoint**: `POST /api/tasks-automations/restore-version`
+
+**Purpose**: Replace current draft script with a published version's script. Chat history is preserved.
+
+**Request Body**:
+
+```typescript
+{
+  orgId: string;
+  taskId: string;
+  automationId: string;
+  version: number; // Which version to restore (e.g., 1, 2, 3)
+}
+```
+
+**Process**:
+
+1. Construct version S3 key: `{orgId}/{taskId}/{automationId}.v{version}.js`
+2. Check if version script exists in S3
+3. If not found, return error: `{ success: false, error: 'Version not found' }`
+4. Construct draft S3 key: `{orgId}/{taskId}/{automationId}.draft.js`
+5. Copy version script to draft key in S3 (overwrites current draft)
+6. Do NOT touch Redis chat history - it should persist
+7. Return success
+
+**Response**:
+
+```typescript
+{
+  success: boolean;
+  error?: string;
+}
+```
+
+**Error Cases**:
+
+- Version script not found in S3
+- S3 copy operation fails
+- Invalid version number
+
+---
+
+## Implementation Notes
+
+### S3 Operations
+
+- Use AWS S3 SDK's `copyObject` method to copy between keys
+- Bucket name should come from environment variables
+- Ensure proper error handling for S3 operations
+
+### Authentication
+
+- These endpoints should require authentication (API key or session)
+- Validate that the user has access to the organization/task/automation
+
+### Redis Chat History
+
+- **Important**: Do NOT clear or modify chat history when restoring versions
+- Chat history key format: `automation:{automationId}:chat`
+- Chat history persists regardless of which version is in the draft
+
+### Example S3 Keys
+
+For automation `aut_68e6a70803cf925eac17896a` in task `tsk_68e6a5c1e0b762e741c2e020`:
+
+- **Draft**: `org_68e6a5c1d30338b3981c2104/tsk_68e6a5c1e0b762e741c2e020/aut_68e6a70803cf925eac17896a.draft.js`
+- **Version 1**: `org_68e6a5c1d30338b3981c2104/tsk_68e6a5c1e0b762e741c2e020/aut_68e6a70803cf925eac17896a.v1.js`
+- **Version 2**: `org_68e6a5c1d30338b3981c2104/tsk_68e6a5c1e0b762e741c2e020/aut_68e6a70803cf925eac17896a.v2.js`
+
+### Integration Flow
+
+#### Publishing a Version
+
+1. User clicks "Publish" in Next.js UI with optional changelog
+2. Next.js calls `POST /api/tasks-automations/publish` (no version number in request)
+3. Enterprise API:
+   - Queries database to get next version number
+   - Copies draft → versioned S3 key
+   - Returns version number and scriptKey
+4. Next.js saves version record to database with returned version number, scriptKey, and changelog
+
+#### Restoring a Version
+
+1. User clicks "Restore Version X" in Next.js UI
+2. Shows confirmation dialog warning current draft will be lost
+3. Next.js calls `POST /api/tasks-automations/restore-version`
+4. Enterprise API copies version script → draft S3 key
+5. Enterprise API returns success
+6. Next.js shows success message
+7. User can continue editing in builder with restored script
+
+### Error Handling
+
+- Return proper HTTP status codes (404 for not found, 400 for bad request, 500 for S3 errors)
+- Include descriptive error messages in response body
+- Log errors for debugging
+
+### Testing Checklist
+
+- [ ] Can publish a draft script as version 1
+- [ ] Can publish multiple versions (1, 2, 3...)
+- [ ] Cannot publish if no draft exists
+- [ ] Can restore version 1 to draft
+- [ ] Restoring doesn't affect chat history
+- [ ] S3 keys follow correct naming convention
+- [ ] Proper error messages when scripts don't exist
diff --git a/apps/api/package.json b/apps/api/package.json
index d46f9e4c9..1f905ed8e 100644
--- a/apps/api/package.json
+++ b/apps/api/package.json
@@ -14,6 +14,7 @@
     "@trycompai/db": "^1.3.7",
     "archiver": "^7.0.1",
     "axios": "^1.12.2",
+    "better-auth": "^1.3.27",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.14.2",
     "jose": "^6.0.12",
diff --git a/apps/api/src/app.module.ts b/apps/api/src/app.module.ts
index 2a1a10725..7280e9c5a 100644
--- a/apps/api/src/app.module.ts
+++ b/apps/api/src/app.module.ts
@@ -17,7 +17,6 @@ import { TasksModule } from './tasks/tasks.module';
 import { VendorsModule } from './vendors/vendors.module';
 import { ContextModule } from './context/context.module';
 
-
 @Module({
   imports: [
     ConfigModule.forRoot({
diff --git a/apps/api/src/automation/automation.controller.ts b/apps/api/src/automation/automation.controller.ts
new file mode 100644
index 000000000..26975fc94
--- /dev/null
+++ b/apps/api/src/automation/automation.controller.ts
@@ -0,0 +1,59 @@
+import {
+  Body,
+  Controller,
+  Param,
+  Patch,
+  Post,
+  UseGuards,
+} from '@nestjs/common';
+import {
+  ApiHeader,
+  ApiOperation,
+  ApiResponse,
+  ApiSecurity,
+  ApiTags,
+} from '@nestjs/swagger';
+import { HybridAuthGuard } from '../auth/hybrid-auth.guard';
+import { AutomationService } from './automation.service';
+import { CreateAutomationDto } from './dto/create-automation.dto';
+import { UpdateAutomationDto } from './dto/update-automation.dto';
+import { AUTOMATION_OPERATIONS } from './schemas/automation-operations';
+import { CREATE_AUTOMATION_RESPONSES } from './schemas/create-automation.responses';
+import { UPDATE_AUTOMATION_RESPONSES } from './schemas/update-automation.responses';
+
+@ApiTags('Automations')
+@Controller({ path: 'automations', version: '1' })
+@UseGuards(HybridAuthGuard)
+@ApiSecurity('apikey')
+@ApiHeader({
+  name: 'X-Organization-Id',
+  description:
+    'Organization ID (required for session auth, optional for API key auth)',
+  required: false,
+})
+export class AutomationController {
+  constructor(private readonly automationService: AutomationService) {}
+
+  @Post()
+  @ApiOperation(AUTOMATION_OPERATIONS.createAutomation)
+  @ApiResponse(CREATE_AUTOMATION_RESPONSES[201])
+  @ApiResponse(CREATE_AUTOMATION_RESPONSES[400])
+  @ApiResponse(CREATE_AUTOMATION_RESPONSES[401])
+  @ApiResponse(CREATE_AUTOMATION_RESPONSES[404])
+  async createAutomation(@Body() createAutomationDto: CreateAutomationDto) {
+    return this.automationService.create(createAutomationDto);
+  }
+
+  @Patch(':automationId')
+  @ApiOperation(AUTOMATION_OPERATIONS.updateAutomation)
+  @ApiResponse(UPDATE_AUTOMATION_RESPONSES[200])
+  @ApiResponse(UPDATE_AUTOMATION_RESPONSES[400])
+  @ApiResponse(UPDATE_AUTOMATION_RESPONSES[401])
+  @ApiResponse(UPDATE_AUTOMATION_RESPONSES[404])
+  async updateAutomation(
+    @Param('automationId') automationId: string,
+    @Body() updateAutomationDto: UpdateAutomationDto,
+  ) {
+    return this.automationService.update(automationId, updateAutomationDto);
+  }
+}
diff --git a/apps/api/src/automation/automation.module.ts b/apps/api/src/automation/automation.module.ts
new file mode 100644
index 000000000..14d470d6d
--- /dev/null
+++ b/apps/api/src/automation/automation.module.ts
@@ -0,0 +1,11 @@
+import { Module } from '@nestjs/common';
+import { AuthModule } from '../auth/auth.module';
+import { AutomationController } from './automation.controller';
+import { AutomationService } from './automation.service';
+
+@Module({
+  imports: [AuthModule],
+  controllers: [AutomationController],
+  providers: [AutomationService],
+})
+export class AutomationModule {}
diff --git a/apps/api/src/automation/automation.service.ts b/apps/api/src/automation/automation.service.ts
new file mode 100644
index 000000000..e07ea953a
--- /dev/null
+++ b/apps/api/src/automation/automation.service.ts
@@ -0,0 +1,64 @@
+import { Injectable, NotFoundException } from '@nestjs/common';
+import { db } from '@trycompai/db';
+import { CreateAutomationDto } from './dto/create-automation.dto';
+import { UpdateAutomationDto } from './dto/update-automation.dto';
+
+@Injectable()
+export class AutomationService {
+  async create(createAutomationDto: CreateAutomationDto) {
+    const { taskId } = createAutomationDto;
+
+    const task = await db.task.findFirst({
+      where: {
+        id: taskId,
+      },
+    });
+
+    if (!task) {
+      throw new NotFoundException('Task not found');
+    }
+
+    const automation = await db.evidenceAutomation.create({
+      data: {
+        name: `${task.title} - AI Automation`,
+        taskId: taskId,
+      },
+    });
+
+    return {
+      success: true,
+      automation: {
+        id: automation.id,
+        name: automation.name,
+      },
+    };
+  }
+
+  async update(automationId: string, updateAutomationDto: UpdateAutomationDto) {
+    const existingAutomation = await db.evidenceAutomation.findFirst({
+      where: {
+        id: automationId,
+      },
+    });
+
+    if (!existingAutomation) {
+      throw new NotFoundException('Automation not found');
+    }
+
+    const automation = await db.evidenceAutomation.update({
+      where: {
+        id: automationId,
+      },
+      data: updateAutomationDto,
+    });
+
+    return {
+      success: true,
+      automation: {
+        id: automation.id,
+        name: automation.name,
+        description: automation.description,
+      },
+    };
+  }
+}
diff --git a/apps/api/src/automation/dto/automation-error-responses.dto.ts b/apps/api/src/automation/dto/automation-error-responses.dto.ts
new file mode 100644
index 000000000..57c394af9
--- /dev/null
+++ b/apps/api/src/automation/dto/automation-error-responses.dto.ts
@@ -0,0 +1,25 @@
+import { ApiProperty } from '@nestjs/swagger';
+
+export class BadRequestResponseDto {
+  @ApiProperty({
+    description: 'Error message',
+    example: 'Invalid task ID or organization ID',
+  })
+  message: string;
+}
+
+export class UnauthorizedResponseDto {
+  @ApiProperty({
+    description: 'Error message',
+    example: 'Unauthorized',
+  })
+  message: string;
+}
+
+export class TaskNotFoundResponseDto {
+  @ApiProperty({
+    description: 'Error message',
+    example: 'Task not found',
+  })
+  message: string;
+}
diff --git a/apps/api/src/automation/dto/automation-responses.dto.ts b/apps/api/src/automation/dto/automation-responses.dto.ts
new file mode 100644
index 000000000..8c5106ea1
--- /dev/null
+++ b/apps/api/src/automation/dto/automation-responses.dto.ts
@@ -0,0 +1,63 @@
+import { ApiProperty } from '@nestjs/swagger';
+
+export class AutomationResponseDto {
+  @ApiProperty({
+    description: 'Automation ID',
+    example: 'auto_abc123def456',
+  })
+  id: string;
+
+  @ApiProperty({
+    description: 'Automation name',
+    example: 'Task Name - Evidence Collection',
+  })
+  name: string;
+
+  @ApiProperty({
+    description: 'Task ID this automation belongs to',
+    example: 'tsk_abc123def456',
+  })
+  taskId: string;
+
+  @ApiProperty({
+    description: 'Organization ID',
+    example: 'org_abc123def456',
+  })
+  organizationId: string;
+
+  @ApiProperty({
+    description: 'Automation status',
+    example: 'active',
+    enum: ['active', 'inactive', 'draft'],
+  })
+  status: string;
+
+  @ApiProperty({
+    description: 'Creation timestamp',
+    example: '2024-01-15T10:30:00Z',
+  })
+  createdAt: Date;
+
+  @ApiProperty({
+    description: 'Last update timestamp',
+    example: '2024-01-15T10:30:00Z',
+  })
+  updatedAt: Date;
+}
+
+export class CreateAutomationResponseDto {
+  @ApiProperty({
+    description: 'Success status',
+    example: true,
+  })
+  success: boolean;
+
+  @ApiProperty({
+    description: 'Created automation details',
+    type: () => AutomationResponseDto,
+  })
+  automation: {
+    id: string;
+    name: string;
+  };
+}
diff --git a/apps/api/src/automation/dto/create-automation.dto.ts b/apps/api/src/automation/dto/create-automation.dto.ts
new file mode 100644
index 000000000..3a75723f3
--- /dev/null
+++ b/apps/api/src/automation/dto/create-automation.dto.ts
@@ -0,0 +1,12 @@
+import { ApiProperty } from '@nestjs/swagger';
+import { IsString, IsNotEmpty } from 'class-validator';
+
+export class CreateAutomationDto {
+  @ApiProperty({
+    description: 'Task ID',
+    example: 'tsk_abc123def456',
+  })
+  @IsString()
+  @IsNotEmpty()
+  taskId: string;
+}
diff --git a/apps/api/src/automation/dto/update-automation.dto.ts b/apps/api/src/automation/dto/update-automation.dto.ts
new file mode 100644
index 000000000..9890f98d3
--- /dev/null
+++ b/apps/api/src/automation/dto/update-automation.dto.ts
@@ -0,0 +1,22 @@
+import { ApiProperty } from '@nestjs/swagger';
+import { IsString, IsOptional } from 'class-validator';
+
+export class UpdateAutomationDto {
+  @ApiProperty({
+    description: 'Automation name',
+    example: 'GitHub Security Check - Evidence Collection',
+    required: false,
+  })
+  @IsString()
+  @IsOptional()
+  name?: string;
+
+  @ApiProperty({
+    description: 'Automation description',
+    example: 'Collects evidence about GitHub repository security settings',
+    required: false,
+  })
+  @IsString()
+  @IsOptional()
+  description?: string;
+}
diff --git a/apps/api/src/automation/schemas/automation-operations.ts b/apps/api/src/automation/schemas/automation-operations.ts
new file mode 100644
index 000000000..b5d9056fb
--- /dev/null
+++ b/apps/api/src/automation/schemas/automation-operations.ts
@@ -0,0 +1,11 @@
+export const AUTOMATION_OPERATIONS = {
+  createAutomation: {
+    summary: 'Create a new evidence automation',
+    description:
+      'Create an automation for collecting evidence for a specific task',
+  },
+  updateAutomation: {
+    summary: 'Update an existing automation',
+    description: 'Update the name or description of an existing automation',
+  },
+};
diff --git a/apps/api/src/automation/schemas/create-automation.responses.ts b/apps/api/src/automation/schemas/create-automation.responses.ts
new file mode 100644
index 000000000..5b60ccd75
--- /dev/null
+++ b/apps/api/src/automation/schemas/create-automation.responses.ts
@@ -0,0 +1,71 @@
+export const CREATE_AUTOMATION_RESPONSES = {
+  201: {
+    status: 201,
+    description: 'Automation created successfully',
+    content: {
+      'application/json': {
+        schema: {
+          type: 'object',
+          properties: {
+            success: { type: 'boolean', example: true },
+            automation: {
+              type: 'object',
+              properties: {
+                id: { type: 'string', example: 'auto_abc123def456' },
+                name: {
+                  type: 'string',
+                  example: 'Task Name - Evidence Collection',
+                },
+              },
+            },
+          },
+        },
+      },
+    },
+  },
+  400: {
+    status: 400,
+    description: 'Bad request - Invalid task ID or organization ID',
+    content: {
+      'application/json': {
+        schema: {
+          type: 'object',
+          properties: {
+            message: {
+              type: 'string',
+              example: 'Invalid task ID or organization ID',
+            },
+          },
+        },
+      },
+    },
+  },
+  401: {
+    status: 401,
+    description: 'Unauthorized - Invalid authentication',
+    content: {
+      'application/json': {
+        schema: {
+          type: 'object',
+          properties: {
+            message: { type: 'string', example: 'Unauthorized' },
+          },
+        },
+      },
+    },
+  },
+  404: {
+    status: 404,
+    description: 'Task not found',
+    content: {
+      'application/json': {
+        schema: {
+          type: 'object',
+          properties: {
+            message: { type: 'string', example: 'Task not found' },
+          },
+        },
+      },
+    },
+  },
+};
diff --git a/apps/api/src/automation/schemas/update-automation.responses.ts b/apps/api/src/automation/schemas/update-automation.responses.ts
new file mode 100644
index 000000000..8a8a5ec71
--- /dev/null
+++ b/apps/api/src/automation/schemas/update-automation.responses.ts
@@ -0,0 +1,69 @@
+export const UPDATE_AUTOMATION_RESPONSES = {
+  200: {
+    status: 200,
+    description: 'Automation updated successfully',
+    content: {
+      'application/json': {
+        schema: {
+          type: 'object',
+          properties: {
+            success: { type: 'boolean', example: true },
+            automation: {
+              type: 'object',
+              properties: {
+                id: { type: 'string', example: 'auto_abc123def456' },
+                name: { type: 'string', example: 'Updated Automation Name' },
+                description: { type: 'string', example: 'Updated description' },
+              },
+            },
+          },
+        },
+      },
+    },
+  },
+  400: {
+    status: 400,
+    description: 'Bad request - Invalid automation ID or data',
+    content: {
+      'application/json': {
+        schema: {
+          type: 'object',
+          properties: {
+            message: {
+              type: 'string',
+              example: 'Invalid automation data',
+            },
+          },
+        },
+      },
+    },
+  },
+  401: {
+    status: 401,
+    description: 'Unauthorized - Invalid authentication',
+    content: {
+      'application/json': {
+        schema: {
+          type: 'object',
+          properties: {
+            message: { type: 'string', example: 'Unauthorized' },
+          },
+        },
+      },
+    },
+  },
+  404: {
+    status: 404,
+    description: 'Automation not found',
+    content: {
+      'application/json': {
+        schema: {
+          type: 'object',
+          properties: {
+            message: { type: 'string', example: 'Automation not found' },
+          },
+        },
+      },
+    },
+  },
+};
diff --git a/apps/api/src/tasks/automations/automations.controller.ts b/apps/api/src/tasks/automations/automations.controller.ts
new file mode 100644
index 000000000..f22b08805
--- /dev/null
+++ b/apps/api/src/tasks/automations/automations.controller.ts
@@ -0,0 +1,233 @@
+import {
+  Body,
+  Controller,
+  Delete,
+  Get,
+  Param,
+  Patch,
+  Post,
+  Query,
+  UseGuards,
+} from '@nestjs/common';
+import {
+  ApiHeader,
+  ApiOperation,
+  ApiParam,
+  ApiResponse,
+  ApiSecurity,
+  ApiTags,
+} from '@nestjs/swagger';
+import { OrganizationId } from '../../auth/auth-context.decorator';
+import { HybridAuthGuard } from '../../auth/hybrid-auth.guard';
+import { TasksService } from '../tasks.service';
+import { AutomationsService } from './automations.service';
+import { CreateAutomationDto } from './dto/create-automation.dto';
+import { UpdateAutomationDto } from './dto/update-automation.dto';
+import { AUTOMATION_OPERATIONS } from './schemas/automation-operations';
+import { CREATE_AUTOMATION_RESPONSES } from './schemas/create-automation.responses';
+import { UPDATE_AUTOMATION_RESPONSES } from './schemas/update-automation.responses';
+
+@ApiTags('Task Automations')
+@Controller({ path: 'tasks/:taskId/automations', version: '1' })
+@UseGuards(HybridAuthGuard)
+@ApiSecurity('apikey')
+@ApiHeader({
+  name: 'X-Organization-Id',
+  description:
+    'Organization ID (required for session auth, optional for API key auth)',
+  required: false,
+})
+export class AutomationsController {
+  constructor(
+    private readonly automationsService: AutomationsService,
+    private readonly tasksService: TasksService,
+  ) {}
+
+  @Get()
+  @ApiOperation({
+    summary: 'Get all automations for a task',
+    description: 'Retrieve all automations for a specific task',
+  })
+  @ApiParam({
+    name: 'taskId',
+    description: 'Unique task identifier',
+    example: 'tsk_abc123def456',
+  })
+  @ApiResponse({
+    status: 200,
+    description: 'Automations retrieved successfully',
+  })
+  async getTaskAutomations(
+    @OrganizationId() organizationId: string,
+    @Param('taskId') taskId: string,
+  ) {
+    // Verify task access first
+    await this.tasksService.verifyTaskAccess(organizationId, taskId);
+
+    return this.automationsService.findByTaskId(taskId);
+  }
+
+  @Get(':automationId')
+  @ApiOperation({
+    summary: 'Get automation details',
+    description: 'Retrieve details for a specific automation',
+  })
+  @ApiParam({
+    name: 'taskId',
+    description: 'Unique task identifier',
+    example: 'tsk_abc123def456',
+  })
+  @ApiParam({
+    name: 'automationId',
+    description: 'Unique automation identifier',
+    example: 'auto_abc123def456',
+  })
+  @ApiResponse({
+    status: 200,
+    description: 'Automation details retrieved successfully',
+  })
+  async getAutomation(
+    @OrganizationId() organizationId: string,
+    @Param('taskId') taskId: string,
+    @Param('automationId') automationId: string,
+  ) {
+    // Verify task access first
+    await this.tasksService.verifyTaskAccess(organizationId, taskId);
+
+    return this.automationsService.findById(automationId);
+  }
+
+  @Post()
+  @ApiOperation(AUTOMATION_OPERATIONS.createAutomation)
+  @ApiParam({
+    name: 'taskId',
+    description: 'Unique task identifier',
+    example: 'tsk_abc123def456',
+  })
+  @ApiResponse(CREATE_AUTOMATION_RESPONSES[201])
+  @ApiResponse(CREATE_AUTOMATION_RESPONSES[400])
+  @ApiResponse(CREATE_AUTOMATION_RESPONSES[401])
+  @ApiResponse(CREATE_AUTOMATION_RESPONSES[404])
+  async createAutomation(
+    @OrganizationId() organizationId: string,
+    @Param('taskId') taskId: string,
+    @Body() createAutomationDto: CreateAutomationDto,
+  ) {
+    // Verify task access first
+    await this.tasksService.verifyTaskAccess(organizationId, taskId);
+
+    return this.automationsService.create(organizationId, { taskId });
+  }
+
+  @Patch(':automationId')
+  @ApiOperation(AUTOMATION_OPERATIONS.updateAutomation)
+  @ApiParam({
+    name: 'taskId',
+    description: 'Unique task identifier',
+    example: 'tsk_abc123def456',
+  })
+  @ApiParam({
+    name: 'automationId',
+    description: 'Unique automation identifier',
+    example: 'auto_abc123def456',
+  })
+  @ApiResponse(UPDATE_AUTOMATION_RESPONSES[200])
+  @ApiResponse(UPDATE_AUTOMATION_RESPONSES[400])
+  @ApiResponse(UPDATE_AUTOMATION_RESPONSES[401])
+  @ApiResponse(UPDATE_AUTOMATION_RESPONSES[404])
+  async updateAutomation(
+    @OrganizationId() organizationId: string,
+    @Param('taskId') taskId: string,
+    @Param('automationId') automationId: string,
+    @Body() updateAutomationDto: UpdateAutomationDto,
+  ) {
+    // Verify task access first
+    await this.tasksService.verifyTaskAccess(organizationId, taskId);
+
+    return this.automationsService.update(automationId, updateAutomationDto);
+  }
+
+  @Delete(':automationId')
+  @ApiOperation({
+    summary: 'Delete an automation',
+    description: 'Delete a specific automation and all its associated data',
+  })
+  @ApiParam({
+    name: 'taskId',
+    description: 'Unique task identifier',
+    example: 'tsk_abc123def456',
+  })
+  @ApiParam({
+    name: 'automationId',
+    description: 'Unique automation identifier',
+    example: 'auto_abc123def456',
+  })
+  @ApiResponse({
+    status: 200,
+    description: 'Automation deleted successfully',
+  })
+  async deleteAutomation(
+    @OrganizationId() organizationId: string,
+    @Param('taskId') taskId: string,
+    @Param('automationId') automationId: string,
+  ) {
+    // Verify task access first
+    await this.tasksService.verifyTaskAccess(organizationId, taskId);
+
+    return this.automationsService.delete(automationId);
+  }
+
+  @Get(':automationId/versions')
+  @ApiOperation({
+    summary: 'Get all versions for an automation',
+    description: 'Retrieve all published versions of an automation script',
+  })
+  @ApiParam({
+    name: 'taskId',
+    description: 'Task ID',
+  })
+  @ApiParam({
+    name: 'automationId',
+    description: 'Automation ID',
+  })
+  @ApiResponse({
+    status: 200,
+    description: 'Versions retrieved successfully',
+    schema: {
+      type: 'object',
+      properties: {
+        success: { type: 'boolean' },
+        versions: {
+          type: 'array',
+          items: {
+            type: 'object',
+            properties: {
+              id: { type: 'string' },
+              version: { type: 'number' },
+              scriptKey: { type: 'string' },
+              changelog: { type: 'string', nullable: true },
+              publishedBy: { type: 'string', nullable: true },
+              createdAt: { type: 'string', format: 'date-time' },
+            },
+          },
+        },
+      },
+    },
+  })
+  async getAutomationVersions(
+    @OrganizationId() organizationId: string,
+    @Param('taskId') taskId: string,
+    @Param('automationId') automationId: string,
+    @Query('limit') limit?: string,
+    @Query('offset') offset?: string,
+  ) {
+    await this.tasksService.verifyTaskAccess(organizationId, taskId);
+    const parsedLimit = limit ? parseInt(limit) : undefined;
+    const parsedOffset = offset ? parseInt(offset) : undefined;
+    return this.automationsService.listVersions(
+      automationId,
+      parsedLimit,
+      parsedOffset,
+    );
+  }
+}
diff --git a/apps/api/src/tasks/automations/automations.module.ts b/apps/api/src/tasks/automations/automations.module.ts
new file mode 100644
index 000000000..27127d42f
--- /dev/null
+++ b/apps/api/src/tasks/automations/automations.module.ts
@@ -0,0 +1,13 @@
+import { Module } from '@nestjs/common';
+import { AuthModule } from '../../auth/auth.module';
+import { TasksService } from '../tasks.service';
+import { AutomationsController } from './automations.controller';
+import { AutomationsService } from './automations.service';
+
+@Module({
+  imports: [AuthModule],
+  controllers: [AutomationsController],
+  providers: [AutomationsService, TasksService],
+  exports: [AutomationsService],
+})
+export class AutomationsModule {}
diff --git a/apps/api/src/tasks/automations/automations.service.ts b/apps/api/src/tasks/automations/automations.service.ts
new file mode 100644
index 000000000..f7f5931b1
--- /dev/null
+++ b/apps/api/src/tasks/automations/automations.service.ts
@@ -0,0 +1,156 @@
+import { Injectable, NotFoundException } from '@nestjs/common';
+import { db } from '@trycompai/db';
+import { CreateAutomationDto } from './dto/create-automation.dto';
+import { UpdateAutomationDto } from './dto/update-automation.dto';
+
+@Injectable()
+export class AutomationsService {
+  async findByTaskId(taskId: string) {
+    const automations = await db.evidenceAutomation.findMany({
+      where: {
+        taskId: taskId,
+      },
+      include: {
+        runs: {
+          orderBy: {
+            createdAt: 'desc',
+          },
+          take: 1,
+        },
+      },
+      orderBy: {
+        createdAt: 'asc',
+      },
+    });
+
+    return {
+      success: true,
+      automations,
+    };
+  }
+
+  async findById(automationId: string) {
+    const automation = await db.evidenceAutomation.findFirst({
+      where: {
+        id: automationId,
+      },
+    });
+
+    if (!automation) {
+      throw new NotFoundException('Automation not found');
+    }
+
+    return {
+      success: true,
+      automation,
+    };
+  }
+
+  async create(
+    organizationId: string,
+    createAutomationDto: CreateAutomationDto,
+  ) {
+    const { taskId } = createAutomationDto;
+
+    // Verify task exists and belongs to organization
+    const task = await db.task.findFirst({
+      where: {
+        id: taskId,
+        organizationId: organizationId,
+      },
+    });
+
+    if (!task) {
+      throw new NotFoundException('Task not found');
+    }
+
+    // Create the automation
+    const automation = await db.evidenceAutomation.create({
+      data: {
+        name: `${task.title} - Evidence Collection`,
+        taskId: taskId,
+      },
+    });
+
+    return {
+      success: true,
+      automation: {
+        id: automation.id,
+        name: automation.name,
+      },
+    };
+  }
+
+  async update(automationId: string, updateAutomationDto: UpdateAutomationDto) {
+    // Verify automation exists and belongs to organization
+    const existingAutomation = await db.evidenceAutomation.findFirst({
+      where: {
+        id: automationId,
+      },
+    });
+
+    if (!existingAutomation) {
+      throw new NotFoundException('Automation not found');
+    }
+
+    // Update the automation
+    const automation = await db.evidenceAutomation.update({
+      where: {
+        id: automationId,
+      },
+      data: updateAutomationDto,
+    });
+
+    return {
+      success: true,
+      automation: {
+        id: automation.id,
+        name: automation.name,
+        description: automation.description,
+      },
+    };
+  }
+
+  async delete(automationId: string) {
+    // Verify automation exists and belongs to organization
+    const existingAutomation = await db.evidenceAutomation.findFirst({
+      where: {
+        id: automationId,
+      },
+    });
+
+    if (!existingAutomation) {
+      throw new NotFoundException('Automation not found');
+    }
+
+    // Delete the automation
+    await db.evidenceAutomation.delete({
+      where: {
+        id: automationId,
+      },
+    });
+
+    return {
+      success: true,
+      message: 'Automation deleted successfully',
+    };
+  }
+
+  async listVersions(automationId: string, limit?: number, offset?: number) {
+    const versions = await db.evidenceAutomationVersion.findMany({
+      where: {
+        evidenceAutomationId: automationId,
+      },
+      orderBy: {
+        version: 'desc',
+      },
+      ...(limit && { take: limit }),
+      ...(offset && { skip: offset }),
+    });
+
+    return {
+      success: true,
+      versions,
+    };
+  }
+}
diff --git a/apps/api/src/tasks/automations/dto/automation-error-responses.dto.ts b/apps/api/src/tasks/automations/dto/automation-error-responses.dto.ts
new file mode 100644
index 000000000..57c394af9
--- /dev/null
+++ b/apps/api/src/tasks/automations/dto/automation-error-responses.dto.ts
@@ -0,0 +1,25 @@
+import { ApiProperty } from '@nestjs/swagger';
+
+export class BadRequestResponseDto {
+  @ApiProperty({
+    description: 'Error message',
+    example: 'Invalid task ID or organization ID',
+  })
+  message: string;
+}
+
+export class UnauthorizedResponseDto {
+  @ApiProperty({
+    description: 'Error message',
+    example: 'Unauthorized',
+  })
+  message: string;
+}
+
+export class TaskNotFoundResponseDto {
+  @ApiProperty({
+    description: 'Error message',
+    example: 'Task not found',
+  })
+  message: string;
+}
diff --git a/apps/api/src/tasks/automations/dto/automation-responses.dto.ts b/apps/api/src/tasks/automations/dto/automation-responses.dto.ts
new file mode 100644
index 000000000..8c5106ea1
--- /dev/null
+++ b/apps/api/src/tasks/automations/dto/automation-responses.dto.ts
@@ -0,0 +1,63 @@
+import { ApiProperty } from '@nestjs/swagger';
+
+export class AutomationResponseDto {
+  @ApiProperty({
+    description: 'Automation ID',
+    example: 'auto_abc123def456',
+  })
+  id: string;
+
+  @ApiProperty({
+    description: 'Automation name',
+    example: 'Task Name - Evidence Collection',
+  })
+  name: string;
+
+  @ApiProperty({
+    description: 'Task ID this automation belongs to',
+    example: 'tsk_abc123def456',
+  })
+  taskId: string;
+
+  @ApiProperty({
+    description: 'Organization ID',
+    example: 'org_abc123def456',
+  })
+  organizationId: string;
+
+  @ApiProperty({
+    description: 'Automation status',
+    example: 'active',
+    enum: ['active', 'inactive', 'draft'],
+  })
+  status: string;
+
+  @ApiProperty({
+    description: 'Creation timestamp',
+    example: '2024-01-15T10:30:00Z',
+  })
+  createdAt: Date;
+
+  @ApiProperty({
+    description: 'Last update timestamp',
+    example: '2024-01-15T10:30:00Z',
+  })
+  updatedAt: Date;
+}
+
+export class CreateAutomationResponseDto {
+  @ApiProperty({
+    description: 'Success status',
+    example: true,
+  })
+  success: boolean;
+
+  @ApiProperty({
+    description: 'Created automation details',
+    type: () => AutomationResponseDto,
+  })
+  automation: {
+    id: string;
+    name: string;
+  };
+}
diff --git a/apps/api/src/tasks/automations/dto/create-automation.dto.ts b/apps/api/src/tasks/automations/dto/create-automation.dto.ts
new file mode 100644
index 000000000..3a75723f3
--- /dev/null
+++ b/apps/api/src/tasks/automations/dto/create-automation.dto.ts
@@ -0,0 +1,12 @@
+import { ApiProperty } from '@nestjs/swagger';
+import { IsString, IsNotEmpty } from 'class-validator';
+
+export class CreateAutomationDto {
+  @ApiProperty({
+    description: 'Task ID',
+    example: 'tsk_abc123def456',
+  })
+  @IsString()
+  @IsNotEmpty()
+  taskId: string;
+}
diff --git a/apps/api/src/tasks/automations/dto/update-automation.dto.ts b/apps/api/src/tasks/automations/dto/update-automation.dto.ts
new file mode 100644
index 000000000..9890f98d3
--- /dev/null
+++ b/apps/api/src/tasks/automations/dto/update-automation.dto.ts
@@ -0,0 +1,22 @@
+import { ApiProperty } from '@nestjs/swagger';
+import { IsString, IsOptional } from 'class-validator';
+
+export class UpdateAutomationDto {
+  @ApiProperty({
+    description: 'Automation name',
+    example: 'GitHub Security Check - Evidence Collection',
+    required: false,
+  })
+  @IsString()
+  @IsOptional()
+  name?: string;
+
+  @ApiProperty({
+    description: 'Automation description',
+    example: 'Collects evidence about GitHub repository security settings',
+    required: false,
+  })
+  @IsString()
+  @IsOptional()
+  description?: string;
+}
diff --git a/apps/api/src/tasks/automations/schemas/automation-operations.ts b/apps/api/src/tasks/automations/schemas/automation-operations.ts
new file mode 100644
index 000000000..b5d9056fb
--- /dev/null
+++ b/apps/api/src/tasks/automations/schemas/automation-operations.ts
@@ -0,0 +1,11 @@
+export const AUTOMATION_OPERATIONS = {
+  createAutomation: {
+    summary: 'Create a new evidence automation',
+    description:
+      'Create an automation for collecting evidence for a specific task',
+  },
+  updateAutomation: {
+    summary: 'Update an existing automation',
+    description: 'Update the name or description of an existing automation',
+  },
+};
diff --git a/apps/api/src/tasks/automations/schemas/create-automation.responses.ts b/apps/api/src/tasks/automations/schemas/create-automation.responses.ts
new file mode 100644
index 000000000..5b60ccd75
--- /dev/null
+++ b/apps/api/src/tasks/automations/schemas/create-automation.responses.ts
@@ -0,0 +1,71 @@
+export const CREATE_AUTOMATION_RESPONSES = {
+  201: {
+    status: 201,
+    description: 'Automation created successfully',
+    content: {
+      'application/json': {
+        schema: {
+          type: 'object',
+          properties: {
+            success: { type: 'boolean', example: true },
+            automation: {
+              type: 'object',
+              properties: {
+                id: { type: 'string', example: 'auto_abc123def456' },
+                name: {
+                  type: 'string',
+                  example: 'Task Name - Evidence Collection',
+                },
+              },
+            },
+          },
+        },
+      },
+    },
+  },
+  400: {
+    status: 400,
+    description: 'Bad request - Invalid task ID or organization ID',
+    content: {
+      'application/json': {
+        schema: {
+          type: 'object',
+          properties: {
+            message: {
+              type: 'string',
+              example: 'Invalid task ID or organization ID',
+            },
+          },
+        },
+      },
+    },
+  },
+  401: {
+    status: 401,
+    description: 'Unauthorized - Invalid authentication',
+    content: {
+      'application/json': {
+        schema: {
+          type: 'object',
+          properties: {
+            message: { type: 'string', example: 'Unauthorized' },
+          },
+        },
+      },
+    },
+  },
+  404: {
+    status: 404,
+    description: 'Task not found',
+    content: {
+      'application/json': {
+        schema: {
+          type: 'object',
+          properties: {
+            message: { type: 'string', example: 'Task not found' },
+          },
+        },
+      },
+    },
+  },
+};
diff --git a/apps/api/src/tasks/automations/schemas/update-automation.responses.ts b/apps/api/src/tasks/automations/schemas/update-automation.responses.ts
new file mode 100644
index 000000000..8a8a5ec71
--- /dev/null
+++ b/apps/api/src/tasks/automations/schemas/update-automation.responses.ts
@@ -0,0 +1,69 @@
+export const UPDATE_AUTOMATION_RESPONSES = {
+  200: {
+    status: 200,
+    description: 'Automation updated successfully',
+    content: {
+      'application/json': {
+        schema: {
+          type: 'object',
+          properties: {
+            success: { type: 'boolean', example: true },
+            automation: {
+              type: 'object',
+              properties: {
+                id: { type: 'string', example: 'auto_abc123def456' },
+                name: { type: 'string', example: 'Updated Automation Name' },
+                description: { type: 'string', example: 'Updated description' },
+              },
+            },
+          },
+        },
+      },
+    },
+  },
+  400: {
+    status: 400,
+    description: 'Bad request - Invalid automation ID or data',
+    content: {
+      'application/json': {
+        schema: {
+          type: 'object',
+          properties: {
+            message: {
+              type: 'string',
+              example: 'Invalid automation data',
+            },
+          },
+        },
+      },
+    },
+  },
+  401: {
+    status: 401,
+    description: 'Unauthorized - Invalid authentication',
+    content: {
+      'application/json': {
+        schema: {
+          type: 'object',
+          properties: {
+            message: { type: 'string', example: 'Unauthorized' },
+          },
+        },
+      },
+    },
+  },
+  404: {
+    status: 404,
+    description: 'Automation not found',
+    content: {
+      'application/json': {
+        schema: {
+          type: 'object',
+          properties: {
+            message: { type: 'string', example: 'Automation not found' },
+          },
+        },
+      },
+    },
+  },
+};
diff --git a/apps/api/src/tasks/dto/task-responses.dto.ts b/apps/api/src/tasks/dto/task-responses.dto.ts
index 442ded044..28a240d96 100644
--- a/apps/api/src/tasks/dto/task-responses.dto.ts
+++ b/apps/api/src/tasks/dto/task-responses.dto.ts
@@ -1,3 +1,4 @@
+import { MemberResponseDto } from '@/devices/dto/member-responses.dto';
 import { ApiProperty } from '@nestjs/swagger';
 
 export class AttachmentResponseDto {
@@ -38,8 +39,6 @@ export class AttachmentResponseDto {
   createdAt: Date;
 }
 
-
-
 export class TaskResponseDto {
   @ApiProperty({
     description: 'Unique identifier for the task',
diff --git a/apps/api/src/tasks/tasks.controller.ts b/apps/api/src/tasks/tasks.controller.ts
index d6faee26a..7632a0b7f 100644
--- a/apps/api/src/tasks/tasks.controller.ts
+++ b/apps/api/src/tasks/tasks.controller.ts
@@ -8,6 +8,7 @@ import {
   HttpCode,
   HttpStatus,
   Param,
+  Patch,
   Post,
   UseGuards,
 } from '@nestjs/common';
@@ -496,4 +497,66 @@ export class TasksController {
       message: 'Attachment deleted successfully',
     };
   }
+
+  // ==================== AUTOMATION RUNS ====================
+
+  @Get(':taskId/automation-runs')
+  @ApiOperation({
+    summary: 'Get all automation runs for a task',
+    description: 'Retrieve all evidence automation runs for a specific task',
+  })
+  @ApiParam({
+    name: 'taskId',
+    description: 'Task ID',
+    example: 'tsk_abc123def456',
+  })
+  @ApiResponse({
+    status: 200,
+    description: 'Automation runs retrieved successfully',
+    content: {
+      'application/json': {
+        schema: {
+          type: 'array',
+          items: {
+            type: 'object',
+            properties: {
+              id: { type: 'string', example: 'ear_abc123def456' },
+              status: {
+                type: 'string',
+                enum: ['PENDING', 'RUNNING', 'COMPLETED', 'FAILED'],
+              },
+              trigger: {
+                type: 'string',
+                enum: ['MANUAL', 'SCHEDULED', 'EVENT'],
+              },
+              createdAt: { type: 'string', format: 'date-time' },
+              completedAt: {
+                type: 'string',
+                format: 'date-time',
+                nullable: true,
+              },
+              error: { type: 'object', nullable: true },
+            },
+          },
+        },
+      },
+    },
+  })
+  @ApiResponse({
+    status: 401,
+    description: 'Unauthorized',
+  })
+  @ApiResponse({
+    status: 404,
+    description: 'Task not found',
+  })
+  async getTaskAutomationRuns(
+    @OrganizationId() organizationId: string,
+    @Param('taskId') taskId: string,
+  ) {
+    return await this.tasksService.getTaskAutomationRuns(
+      organizationId,
+      taskId,
+    );
+  }
 }
diff --git a/apps/api/src/tasks/tasks.module.ts b/apps/api/src/tasks/tasks.module.ts
index 34a6604a8..914cb2612 100644
--- a/apps/api/src/tasks/tasks.module.ts
+++ b/apps/api/src/tasks/tasks.module.ts
@@ -1,11 +1,12 @@
 import { Module } from '@nestjs/common';
 import { AttachmentsModule } from '../attachments/attachments.module';
 import { AuthModule } from '../auth/auth.module';
+import { AutomationsModule } from './automations/automations.module';
 import { TasksController } from './tasks.controller';
 import { TasksService } from './tasks.service';
 
 @Module({
-  imports: [AuthModule, AttachmentsModule],
+  imports: [AuthModule, AttachmentsModule, AutomationsModule],
   controllers: [TasksController],
   providers: [TasksService],
   exports: [TasksService],
diff --git a/apps/api/src/tasks/tasks.service.ts b/apps/api/src/tasks/tasks.service.ts
index e64d76264..375c64e74 100644
--- a/apps/api/src/tasks/tasks.service.ts
+++ b/apps/api/src/tasks/tasks.service.ts
@@ -49,20 +49,16 @@ export class TasksService {
           id: taskId,
           organizationId,
         },
+        include: {
+          assignee: true,
+        },
       });
 
       if (!task) {
         throw new BadRequestException('Task not found or access denied');
       }
 
-      return {
-        id: task.id,
-        title: task.title,
-        description: task.description,
-        status: task.status,
-        createdAt: task.createdAt,
-        updatedAt: task.updatedAt,
-      };
+      return task;
     } catch (error) {
       console.error('Error fetching task:', error);
       if (error instanceof BadRequestException) {
@@ -90,4 +86,30 @@ export class TasksService {
       throw new BadRequestException('Task not found or access denied');
     }
   }
+
+  /**
+   * Get all automation runs for a task
+   */
+  async getTaskAutomationRuns(organizationId: string, taskId: string) {
+    // Verify task access
+    await this.verifyTaskAccess(organizationId, taskId);
+
+    const runs = await db.evidenceAutomationRun.findMany({
+      where: {
+        taskId,
+      },
+      include: {
+        evidenceAutomation: {
+          select: {
+            name: true,
+          },
+        },
+      },
+      orderBy: {
+        createdAt: 'desc',
+      },
+    });
+
+    return runs;
+  }
 }
diff --git a/apps/api/tsconfig.json b/apps/api/tsconfig.json
index 7bc839792..7e903ec25 100644
--- a/apps/api/tsconfig.json
+++ b/apps/api/tsconfig.json
@@ -10,7 +10,7 @@
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
     "allowSyntheticDefaultImports": true,
-    "target": "ES2023",
+    "target": "esnext",
     "sourceMap": true,
     "outDir": "./dist",
     "baseUrl": "./",
diff --git a/apps/app/next.config.ts b/apps/app/next.config.ts
index 254702356..affee2e36 100644
--- a/apps/app/next.config.ts
+++ b/apps/app/next.config.ts
@@ -39,7 +39,7 @@ const config: NextConfig = {
     process.env.NODE_ENV === 'production' && process.env.STATIC_ASSETS_URL
       ? `${process.env.STATIC_ASSETS_URL}/app`
       : '',
-  reactStrictMode: true,
+  reactStrictMode: false,
   transpilePackages: ['@trycompai/db', '@prisma/client'],
   images: {
     remotePatterns: [
diff --git a/apps/app/package.json b/apps/app/package.json
index 9f6548972..a1c39c34d 100644
--- a/apps/app/package.json
+++ b/apps/app/package.json
@@ -6,7 +6,7 @@
     "@ai-sdk/groq": "^2.0.0",
     "@ai-sdk/openai": "^2.0.0",
     "@ai-sdk/provider": "^2.0.0",
-    "@ai-sdk/react": "^2.0.0",
+    "@ai-sdk/react": "^2.0.60",
     "@ai-sdk/rsc": "^1.0.0",
     "@aws-sdk/client-lambda": "^3.891.0",
     "@aws-sdk/client-s3": "^3.859.0",
@@ -59,12 +59,13 @@
     "@upstash/ratelimit": "^2.0.5",
     "@vercel/sandbox": "^0.0.21",
     "@vercel/sdk": "^1.7.1",
-    "ai": "^5.0.0",
+    "ai": "^5.0.60",
     "axios": "^1.9.0",
     "better-auth": "^1.3.27",
     "botid": "^1.5.5",
     "canvas-confetti": "^1.9.3",
     "d3": "^7.9.0",
+    "date-fns": "^4.1.0",
     "dub": "^0.66.1",
     "framer-motion": "^12.18.1",
     "geist": "^1.3.1",
diff --git a/apps/app/src/app/(app)/[orgId]/frameworks/page.tsx b/apps/app/src/app/(app)/[orgId]/frameworks/page.tsx
index bb32ec3cb..d26062890 100644
--- a/apps/app/src/app/(app)/[orgId]/frameworks/page.tsx
+++ b/apps/app/src/app/(app)/[orgId]/frameworks/page.tsx
@@ -22,6 +22,10 @@ export default async function DashboardPage({ params }: { params: Promise<{ orgI
     headers: await headers(),
   });
 
+  if (!session) {
+    redirect('/login');
+  }
+
   const org = await db.organization.findUnique({
     where: { id: organizationId },
     select: { onboardingCompleted: true },
diff --git a/apps/app/src/app/(app)/[orgId]/people/[employeeId]/page.tsx b/apps/app/src/app/(app)/[orgId]/people/[employeeId]/page.tsx
index c9c9fcacd..e07fbd922 100644
--- a/apps/app/src/app/(app)/[orgId]/people/[employeeId]/page.tsx
+++ b/apps/app/src/app/(app)/[orgId]/people/[employeeId]/page.tsx
@@ -24,19 +24,17 @@ export default async function EmployeeDetailsPage({
     headers: await headers(),
   });
 
-  const organizationId = session?.session.activeOrganizationId;
-
   const currentUserMember = await db.member.findFirst({
     where: {
-      organizationId,
-      userId: session?.user.id,
+      organizationId: orgId,
+      userId: session?.user?.id,
     },
   });
 
   const canEditMembers =
     currentUserMember?.role.includes('owner') || currentUserMember?.role.includes('admin') || false;
 
-  if (!organizationId) {
+  if (!orgId) {
     redirect('/');
   }
 
diff --git a/apps/app/src/app/(app)/[orgId]/people/all/components/TeamMembers.tsx b/apps/app/src/app/(app)/[orgId]/people/all/components/TeamMembers.tsx
index 3bb957f10..fdeff7173 100644
--- a/apps/app/src/app/(app)/[orgId]/people/all/components/TeamMembers.tsx
+++ b/apps/app/src/app/(app)/[orgId]/people/all/components/TeamMembers.tsx
@@ -21,11 +21,15 @@ export async function TeamMembers() {
   const session = await auth.api.getSession({
     headers: await headers(),
   });
-  const organizationId = session?.session.activeOrganizationId;
+  const organizationId = session?.session?.activeOrganizationId;
+
+  if (!organizationId) {
+    return null;
+  }
 
   const currentUserMember = await db.member.findFirst({
     where: {
-      organizationId: session?.session.activeOrganizationId,
+      organizationId: organizationId,
       userId: session?.user.id,
     },
   });
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/actions/task-automation-actions.ts b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/actions/task-automation-actions.ts
similarity index 65%
rename from apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/actions/task-automation-actions.ts
rename to apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/actions/task-automation-actions.ts
index 7af234d9c..4b7d4955a 100644
--- a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/actions/task-automation-actions.ts
+++ b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/actions/task-automation-actions.ts
@@ -1,5 +1,6 @@
 'use server';
 
+import { db } from '@db';
 /**
  * Server actions for task automation
  * These actions securely call the enterprise API with server-side license key
@@ -60,6 +61,8 @@ async function callEnterpriseApi<T>(
     });
   }
 
+  console.log('url', url.toString());
+
   const method = options.method || 'GET';
 
   const response = await fetch(url.toString(), {
@@ -182,7 +185,7 @@ export async function listAutomationScripts(orgId: string) {
 export async function executeAutomationScript(data: {
   orgId: string;
   taskId: string;
-  sandboxId?: string;
+  automationId: string;
 }) {
   try {
     const result = await callEnterpriseApi('/api/tasks-automations/trigger/execute', {
@@ -263,3 +266,149 @@ export const getAutomationRunStatus = async (runId: string) => {
     };
   }
 };
+
+/**
+ * Load chat history for an automation
+ */
+export async function loadChatHistory(automationId: string, offset = 0, limit = 50) {
+  try {
+    const response = await callEnterpriseApi<{
+      messages: any[];
+      total: number;
+      hasMore: boolean;
+    }>('/api/tasks-automations/chat/history', {
+      method: 'GET',
+      params: {
+        automationId,
+        offset: offset.toString(),
+        limit: limit.toString(),
+      },
+    });
+
+    return {
+      success: true,
+      data: response,
+    };
+  } catch (error) {
+    console.error('[loadChatHistory] Failed:', error);
+    return {
+      success: false,
+      error: error instanceof Error ? error.message : 'Failed to load chat history',
+    };
+  }
+}
+
+/**
+ * Save chat history for an automation
+ */
+export async function saveChatHistory(automationId: string, messages: any[]) {
+  try {
+    await callEnterpriseApi('/api/tasks-automations/chat/save', {
+      method: 'POST',
+      body: {
+        automationId,
+        messages,
+      },
+    });
+
+    return {
+      success: true,
+    };
+  } catch (error) {
+    console.error('[saveChatHistory] Failed:', error);
+    return {
+      success: false,
+      error: error instanceof Error ? error.message : 'Failed to save chat history',
+    };
+  }
+}
+
+/**
+ * Publish current draft as a new version
+ */
+export async function publishAutomation(
+  orgId: string,
+  taskId: string,
+  automationId: string,
+  changelog?: string,
+) {
+  try {
+    // Call enterprise API to copy draft → versioned S3 key
+    const response = await callEnterpriseApi<{
+      success: boolean;
+      version: number;
+      scriptKey: string;
+    }>('/api/tasks-automations/publish', {
+      method: 'POST',
+      body: {
+        orgId,
+        taskId,
+        automationId,
+      },
+    });
+
+    if (!response.success) {
+      throw new Error('Enterprise API failed to publish');
+    }
+
+    // Save version record to database
+    const version = await db.evidenceAutomationVersion.create({
+      data: {
+        evidenceAutomationId: automationId,
+        version: response.version,
+        scriptKey: response.scriptKey,
+        changelog,
+      },
+    });
+
+    return {
+      success: true,
+      version,
+    };
+  } catch (error) {
+    console.error('[publishAutomation] Failed:', error);
+    return {
+      success: false,
+      error: error instanceof Error ? error.message : 'Failed to publish automation',
+    };
+  }
+}
+
+/**
+ * Restore a version to draft
+ */
+export async function restoreVersion(
+  orgId: string,
+  taskId: string,
+  automationId: string,
+  version: number,
+) {
+  try {
+    const response = await callEnterpriseApi<{ success: boolean }>(
+      '/api/tasks-automations/restore-version',
+      {
+        method: 'POST',
+        body: {
+          orgId,
+          taskId,
+          automationId,
+          version,
+        },
+      },
+    );
+
+    if (!response.success) {
+      throw new Error('Enterprise API failed to restore version');
+    }
+
+    return {
+      success: true,
+    };
+  } catch (error) {
+    console.error('[restoreVersion] Failed:', error);
+    return {
+      success: false,
+      error: error instanceof Error ? error.message : 'Failed to restore version',
+    };
+  }
+}
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/automation-layout-wrapper.tsx b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/automation-layout-wrapper.tsx
similarity index 100%
rename from apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/automation-layout-wrapper.tsx
rename to apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/automation-layout-wrapper.tsx
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
new file mode 100644
index 000000000..42f804142
--- /dev/null
+++ b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/chat.tsx
@@ -0,0 +1,147 @@
+'use client';
+
+import { cn } from '@/lib/utils';
+import { useChat } from '@ai-sdk/react';
+import Image from 'next/image';
+import { useCallback, useEffect, useRef, useState } from 'react';
+import {
+  Conversation,
+  ConversationContent,
+  ConversationScrollButton,
+} from './components/ai-elements/conversation';
+import { ChatBreadcrumb } from './components/chat/ChatBreadcrumb';
+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 { useChatHandlers } from './hooks/use-chat-handlers';
+import { useTaskAutomation } from './hooks/use-task-automation';
+import { useSharedChatContext } from './lib/chat-context';
+import { useTaskAutomationStore } from './lib/task-automation-store';
+
+interface Props {
+  className: string;
+  modelId?: string;
+  orgId: string;
+  taskId: string;
+  taskName?: string;
+  automationId: string;
+}
+
+export function Chat({ className, orgId, taskId, taskName, automationId }: Props) {
+  const [input, setInput] = useState('');
+  const { chat, updateAutomationId } = useSharedChatContext();
+  const { messages, sendMessage, status } = useChat<ChatUIMessage>({
+    chat,
+  });
+  const { setChatStatus, scriptUrl } = useTaskAutomationStore();
+  const inputRef = useRef<HTMLInputElement | null>(null);
+  const { automation } = useTaskAutomation();
+
+  // Ephemeral mode - automation not created yet
+  const isEphemeral = automationId === 'new';
+
+  const { validateAndSubmitMessage, handleSecretAdded, handleInfoProvided } = useChatHandlers({
+    sendMessage,
+    setInput,
+    orgId,
+    taskId,
+    automationId,
+    isEphemeral,
+    updateAutomationId,
+  });
+
+  const handleExampleClick = useCallback(
+    (prompt: string) => {
+      setInput(prompt);
+      inputRef.current?.focus();
+    },
+    [setInput],
+  );
+
+  useEffect(() => {
+    setChatStatus(status);
+  }, [status, setChatStatus]);
+
+  const hasMessages = messages.length > 0;
+
+  return (
+    <div
+      className={cn(className, 'selection:bg-primary selection:text-white relative')}
+      style={{ height: 'calc(100vh - 6em)' }}
+    >
+      <Image
+        src="/automation-bg.svg"
+        alt="Automation"
+        width={538}
+        height={561}
+        className="absolute top-0 right-0 z-10 pointer-events-none opacity-50"
+      />
+
+      <PanelHeader className="shrink-0 relative z-20">
+        <div className="flex items-center justify-between w-full">
+          <ChatBreadcrumb
+            orgId={orgId}
+            taskId={taskId}
+            taskName={taskName}
+            automationId={automationId}
+            automationName={automation?.name}
+            isEphemeral={isEphemeral}
+          />
+        </div>
+      </PanelHeader>
+
+      {/* Messages Area */}
+      {!hasMessages ? (
+        <form
+          className={cn('flex flex-col w-full h-full px-58 z-20', scriptUrl && 'px-8 pb-4')}
+          onSubmit={async (event) => {
+            event.preventDefault();
+            validateAndSubmitMessage(input);
+          }}
+        >
+          <EmptyState
+            input={input}
+            onInputChange={setInput}
+            onExampleClick={handleExampleClick}
+            status={status}
+            inputRef={inputRef}
+          />
+        </form>
+      ) : (
+        <div className="flex flex-col h-full relative z-20">
+          <Conversation className="flex-1 min-h-0">
+            <ConversationContent className="space-y-4 chat-scrollbar">
+              {messages.map((message) => (
+                <Message
+                  key={message.id}
+                  message={message}
+                  orgId={orgId}
+                  onSecretAdded={handleSecretAdded}
+                  onInfoProvided={handleInfoProvided}
+                />
+              ))}
+            </ConversationContent>
+            <ConversationScrollButton />
+          </Conversation>
+
+          <form
+            className="flex py-6 px-4"
+            onSubmit={async (event) => {
+              event.preventDefault();
+              validateAndSubmitMessage(input);
+            }}
+          >
+            <Input
+              disabled={status === 'streaming' || status === 'submitted'}
+              onChange={(e) => setInput(e.target.value)}
+              placeholder="Ask me to create an automation..."
+              value={input}
+            />
+          </form>
+        </div>
+      )}
+    </div>
+  );
+}
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/AutomationPageClient.tsx b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/AutomationPageClient.tsx
similarity index 81%
rename from apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/AutomationPageClient.tsx
rename to apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/AutomationPageClient.tsx
index 4f32f535c..645c1647e 100644
--- a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/AutomationPageClient.tsx
+++ b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/AutomationPageClient.tsx
@@ -11,10 +11,11 @@ import { WorkflowVisualizerSimple as WorkflowVisualizer } from './workflow/workf
 interface Props {
   orgId: string;
   taskId: string;
+  automationId: string;
   taskName: string;
 }
 
-export function AutomationPageClient({ orgId, taskId, taskName }: Props) {
+export function AutomationPageClient({ orgId, taskId, automationId, taskName }: Props) {
   const { scriptUrl } = useTaskAutomationStore();
   const { chat } = useSharedChatContext();
   const { messages } = useChat<ChatUIMessage>({ chat });
@@ -31,7 +32,13 @@ export function AutomationPageClient({ orgId, taskId, taskName }: Props) {
       {/* Mobile layout tabs taking the whole space*/}
       <div className="flex flex-1 w-full min-h-0 overflow-hidden md:hidden">
         <TabContent tabId="chat" className="flex-1 min-h-0">
-          <Chat className="h-full" orgId={orgId} taskId={taskId} taskName={taskName} />
+          <Chat
+            className="h-full"
+            orgId={orgId}
+            taskId={taskId}
+            automationId={automationId}
+            taskName={taskName}
+          />
         </TabContent>
         <TabContent tabId="workflow" className="flex-1">
           <WorkflowVisualizer className="flex-1 overflow-hidden" />
@@ -45,7 +52,13 @@ export function AutomationPageClient({ orgId, taskId, taskName }: Props) {
             scriptUrl || hasMessages ? 'w-1/2' : 'w-full'
           }`}
         >
-          <Chat className="h-full w-full" orgId={orgId} taskId={taskId} taskName={taskName} />
+          <Chat
+            className="h-full w-full"
+            orgId={orgId}
+            taskId={taskId}
+            automationId={automationId}
+            taskName={taskName}
+          />
         </div>
 
         {/* Workflow panel - slides in from right */}
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/AutomationSettingsDialogs.tsx b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/AutomationSettingsDialogs.tsx
new file mode 100644
index 000000000..f516f4c34
--- /dev/null
+++ b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/AutomationSettingsDialogs.tsx
@@ -0,0 +1,240 @@
+'use client';
+
+import { api } from '@/lib/api-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 { Textarea } from '@comp/ui/textarea';
+import { useParams } from 'next/navigation';
+import { useEffect, useState } from 'react';
+import { toast } from 'sonner';
+import { useTaskAutomation } from '../hooks/use-task-automation';
+
+interface EditNameDialogProps {
+  open: boolean;
+  onOpenChange: (open: boolean) => void;
+}
+
+interface EditDescriptionDialogProps {
+  open: boolean;
+  onOpenChange: (open: boolean) => void;
+}
+
+interface DeleteDialogProps {
+  open: boolean;
+  onOpenChange: (open: boolean) => void;
+}
+
+export function EditNameDialog({ open, onOpenChange }: EditNameDialogProps) {
+  const { automation, mutate } = useTaskAutomation();
+  const { orgId, taskId, automationId } = useParams<{
+    orgId: string;
+    taskId: string;
+    automationId: string;
+  }>();
+  const [name, setName] = useState(automation?.name || '');
+  const [isSaving, setIsSaving] = useState(false);
+
+  // Update local state when automation data changes
+  useEffect(() => {
+    setName(automation?.name || '');
+  }, [automation?.name]);
+
+  const handleSave = async () => {
+    if (!name.trim()) {
+      toast.error('Name cannot be empty');
+      return;
+    }
+
+    setIsSaving(true);
+    try {
+      const response = await api.patch(
+        `/v1/tasks/${taskId}/automations/${automationId}`,
+        { name: name.trim() },
+        orgId,
+      );
+
+      if (response.error) {
+        throw new Error(response.error);
+      }
+
+      await mutate(); // Refresh automation data
+      onOpenChange(false);
+      toast.success('Automation name updated');
+    } catch (error) {
+      toast.error('Failed to update name');
+    } finally {
+      setIsSaving(false);
+    }
+  };
+
+  return (
+    <Dialog open={open} onOpenChange={onOpenChange}>
+      <DialogContent>
+        <DialogHeader>
+          <DialogTitle>Edit Automation Name</DialogTitle>
+          <DialogDescription>
+            Update the name for this automation. This will help you identify it later.
+          </DialogDescription>
+        </DialogHeader>
+
+        <div className="space-y-4 py-4">
+          <div className="space-y-2">
+            <Label htmlFor="automation-name">Automation Name</Label>
+            <Input
+              id="automation-name"
+              value={name}
+              onChange={(e) => setName(e.target.value)}
+              placeholder="Enter automation name"
+            />
+          </div>
+        </div>
+
+        <DialogFooter>
+          <Button variant="outline" onClick={() => onOpenChange(false)}>
+            Cancel
+          </Button>
+          <Button onClick={handleSave} disabled={isSaving || !name.trim()}>
+            {isSaving ? 'Saving...' : 'Save Changes'}
+          </Button>
+        </DialogFooter>
+      </DialogContent>
+    </Dialog>
+  );
+}
+
+export function EditDescriptionDialog({ open, onOpenChange }: EditDescriptionDialogProps) {
+  const { automation, mutate } = useTaskAutomation();
+  const { orgId, taskId, automationId } = useParams<{
+    orgId: string;
+    taskId: string;
+    automationId: string;
+  }>();
+  const [description, setDescription] = useState(automation?.description || '');
+  const [isSaving, setIsSaving] = useState(false);
+
+  // Update local state when automation data changes
+  useEffect(() => {
+    setDescription(automation?.description || '');
+  }, [automation?.description]);
+
+  const handleSave = async () => {
+    setIsSaving(true);
+    try {
+      const response = await api.patch(
+        `/v1/tasks/${taskId}/automations/${automationId}`,
+        { description: description.trim() },
+        orgId,
+      );
+
+      if (response.error) {
+        throw new Error(response.error);
+      }
+
+      await mutate(); // Refresh automation data
+      onOpenChange(false);
+      toast.success('Automation description updated');
+    } catch (error) {
+      toast.error('Failed to update description');
+    } finally {
+      setIsSaving(false);
+    }
+  };
+
+  return (
+    <Dialog open={open} onOpenChange={onOpenChange}>
+      <DialogContent>
+        <DialogHeader>
+          <DialogTitle>Edit Automation Description</DialogTitle>
+          <DialogDescription>
+            Add or update the description for this automation to help others understand its purpose.
+          </DialogDescription>
+        </DialogHeader>
+
+        <div className="space-y-4 py-4">
+          <div className="space-y-2">
+            <Label htmlFor="automation-description">Description</Label>
+            <Textarea
+              id="automation-description"
+              value={description}
+              onChange={(e) => setDescription(e.target.value)}
+              placeholder="Describe what this automation does..."
+              rows={4}
+            />
+          </div>
+        </div>
+
+        <DialogFooter>
+          <Button variant="outline" onClick={() => onOpenChange(false)}>
+            Cancel
+          </Button>
+          <Button onClick={handleSave} disabled={isSaving}>
+            {isSaving ? 'Saving...' : 'Save Changes'}
+          </Button>
+        </DialogFooter>
+      </DialogContent>
+    </Dialog>
+  );
+}
+
+export function DeleteAutomationDialog({ open, onOpenChange }: DeleteDialogProps) {
+  const { automation } = useTaskAutomation();
+  const { orgId, taskId, automationId } = useParams<{
+    orgId: string;
+    taskId: string;
+    automationId: string;
+  }>();
+  const [isDeleting, setIsDeleting] = useState(false);
+
+  const handleDelete = async () => {
+    setIsDeleting(true);
+    try {
+      const response = await api.delete(`/v1/tasks/${taskId}/automations/${automationId}`, orgId);
+
+      if (response.error) {
+        throw new Error(response.error);
+      }
+
+      onOpenChange(false);
+      toast.success('Automation deleted');
+
+      // Redirect back to task page after successful deletion
+      window.location.href = `/${orgId}/tasks/${taskId}`;
+    } catch (error) {
+      toast.error('Failed to delete automation');
+    } finally {
+      setIsDeleting(false);
+    }
+  };
+
+  return (
+    <Dialog open={open} onOpenChange={onOpenChange}>
+      <DialogContent>
+        <DialogHeader>
+          <DialogTitle>Delete Automation</DialogTitle>
+          <DialogDescription>
+            Are you sure you want to delete "{automation?.name}"? This action cannot be undone and
+            will permanently remove the automation and all its data.
+          </DialogDescription>
+        </DialogHeader>
+
+        <DialogFooter>
+          <Button variant="outline" onClick={() => onOpenChange(false)}>
+            Cancel
+          </Button>
+          <Button variant="destructive" onClick={handleDelete} disabled={isDeleting}>
+            {isDeleting ? 'Deleting...' : 'Delete Automation'}
+          </Button>
+        </DialogFooter>
+      </DialogContent>
+    </Dialog>
+  );
+}
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/PublishDialog.tsx b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/PublishDialog.tsx
new file mode 100644
index 000000000..452b1775b
--- /dev/null
+++ b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/PublishDialog.tsx
@@ -0,0 +1,94 @@
+'use client';
+
+import { Button } from '@comp/ui/button';
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+} from '@comp/ui/dialog';
+import { Label } from '@comp/ui/label';
+import { Textarea } from '@comp/ui/textarea';
+import { Loader2 } from 'lucide-react';
+import { useParams } from 'next/navigation';
+import { useState } from 'react';
+import { toast } from 'sonner';
+import { publishAutomation } from '../actions/task-automation-actions';
+import { useAutomationVersions } from '../hooks/use-automation-versions';
+
+interface PublishDialogProps {
+  open: boolean;
+  onOpenChange: (open: boolean) => void;
+}
+
+export function PublishDialog({ open, onOpenChange }: PublishDialogProps) {
+  const { orgId, taskId, automationId } = useParams<{
+    orgId: string;
+    taskId: string;
+    automationId: string;
+  }>();
+  const [changelog, setChangelog] = useState('');
+  const [isPublishing, setIsPublishing] = useState(false);
+  const { mutate } = useAutomationVersions();
+
+  const handlePublish = async () => {
+    setIsPublishing(true);
+
+    try {
+      const result = await publishAutomation(orgId, taskId, automationId, changelog || undefined);
+
+      if (!result.success) {
+        throw new Error(result.error || 'Failed to publish');
+      }
+
+      toast.success(`Version ${result.version?.version} published successfully!`);
+      setChangelog('');
+      onOpenChange(false);
+
+      // Refresh versions list
+      await mutate();
+    } catch (error) {
+      toast.error(error instanceof Error ? error.message : 'Failed to publish automation');
+    } finally {
+      setIsPublishing(false);
+    }
+  };
+
+  return (
+    <Dialog open={open} onOpenChange={onOpenChange}>
+      <DialogContent>
+        <DialogHeader>
+          <DialogTitle>Publish Automation</DialogTitle>
+          <DialogDescription>
+            Create a new version of this automation. The current draft will remain editable.
+          </DialogDescription>
+        </DialogHeader>
+
+        <div className="space-y-4 py-4">
+          <div className="space-y-2">
+            <Label htmlFor="changelog">Changelog (optional)</Label>
+            <Textarea
+              id="changelog"
+              placeholder="Describe what changed in this version..."
+              value={changelog}
+              onChange={(e) => setChangelog(e.target.value)}
+              rows={4}
+            />
+          </div>
+        </div>
+
+        <DialogFooter>
+          <Button variant="outline" onClick={() => onOpenChange(false)} disabled={isPublishing}>
+            Cancel
+          </Button>
+          <Button onClick={handlePublish} disabled={isPublishing}>
+            {isPublishing && <Loader2 className="h-4 w-4 mr-2 animate-spin" />}
+            {isPublishing ? 'Publishing...' : 'Publish'}
+          </Button>
+        </DialogFooter>
+      </DialogContent>
+    </Dialog>
+  );
+}
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/ai-elements/conversation.tsx b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/ai-elements/conversation.tsx
similarity index 100%
rename from apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/ai-elements/conversation.tsx
rename to apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/ai-elements/conversation.tsx
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/ai-elements/loader.tsx b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/ai-elements/loader.tsx
similarity index 100%
rename from apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/ai-elements/loader.tsx
rename to apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/ai-elements/loader.tsx
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/chat/ChatBreadcrumb.tsx b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/chat/ChatBreadcrumb.tsx
new file mode 100644
index 000000000..19bc853b4
--- /dev/null
+++ b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/chat/ChatBreadcrumb.tsx
@@ -0,0 +1,88 @@
+import {
+  Breadcrumb,
+  BreadcrumbItem,
+  BreadcrumbLink,
+  BreadcrumbList,
+  BreadcrumbSeparator,
+} from '@comp/ui/breadcrumb';
+import { ChevronRight } from 'lucide-react';
+import Link from 'next/link';
+
+interface ChatBreadcrumbProps {
+  orgId: string;
+  taskId: string;
+  taskName?: string;
+  automationId: string;
+  automationName?: string;
+  isEphemeral: boolean;
+}
+
+export function ChatBreadcrumb({
+  orgId,
+  taskId,
+  taskName,
+  automationId,
+  automationName,
+  isEphemeral,
+}: ChatBreadcrumbProps) {
+  return (
+    <Breadcrumb>
+      <BreadcrumbList>
+        <BreadcrumbItem>
+          <BreadcrumbLink asChild>
+            <Link
+              href={`/${orgId}/tasks`}
+              className="text-xs text-muted-foreground hover:text-foreground"
+            >
+              Tasks
+            </Link>
+          </BreadcrumbLink>
+        </BreadcrumbItem>
+        <BreadcrumbSeparator>
+          <ChevronRight className="w-3 h-3" />
+        </BreadcrumbSeparator>
+        <BreadcrumbItem>
+          <BreadcrumbLink asChild>
+            <Link
+              href={`/${orgId}/tasks/${taskId}`}
+              className="text-xs text-muted-foreground hover:text-foreground"
+            >
+              {taskName || 'Task'}
+            </Link>
+          </BreadcrumbLink>
+        </BreadcrumbItem>
+        <BreadcrumbSeparator>
+          <ChevronRight className="w-3 h-3" />
+        </BreadcrumbSeparator>
+        <BreadcrumbItem>
+          <BreadcrumbLink asChild>
+            {isEphemeral ? (
+              <span className="font-medium text-xs text-foreground/90 cursor-default">
+                New Automation
+              </span>
+            ) : (
+              <Link
+                href={`/${orgId}/tasks/${taskId}/automations/${automationId}/overview`}
+                className="text-xs text-muted-foreground hover:text-foreground"
+              >
+                {automationName || 'Automation'}
+              </Link>
+            )}
+          </BreadcrumbLink>
+        </BreadcrumbItem>
+        {!isEphemeral && (
+          <>
+            <BreadcrumbSeparator>
+              <ChevronRight className="w-3 h-3" />
+            </BreadcrumbSeparator>
+            <BreadcrumbItem>
+              <BreadcrumbLink asChild>
+                <span className="font-medium text-xs text-foreground/90 cursor-default">Edit</span>
+              </BreadcrumbLink>
+            </BreadcrumbItem>
+          </>
+        )}
+      </BreadcrumbList>
+    </Breadcrumb>
+  );
+}
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
new file mode 100644
index 000000000..e01cf1103
--- /dev/null
+++ b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/chat/EmptyState.tsx
@@ -0,0 +1,71 @@
+import { Card, CardDescription, CardHeader } from '@comp/ui/card';
+import Image from 'next/image';
+import { Input } from '../../components/ui/input';
+import { AUTOMATION_EXAMPLES, AutomationExample } from '../../constants/automation-examples';
+
+interface EmptyStateProps {
+  input: string;
+  onInputChange: (value: string) => void;
+  onExampleClick: (prompt: string) => void;
+  status: string;
+  inputRef: React.RefObject<HTMLInputElement | null>;
+}
+
+export function EmptyState({
+  input,
+  onInputChange,
+  onExampleClick,
+  status,
+  inputRef,
+}: EmptyStateProps) {
+  return (
+    <div className="flex-1 min-h-0 overflow-y-auto h-full z-20">
+      <div className="w-full h-full flex flex-col items-center py-48">
+        <div className="w-full max-w-3xl text-center space-y-8 mb-16">
+          <p className="text-2xl font-medium text-primary tracking-wide z-20">
+            What evidence do you want to collect?
+          </p>
+          <Input
+            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 hover:scale-[1.01] focus:shadow-lg focus:shadow-primary/10 focus:scale-[1.02] focus:ring-2 focus:ring-primary/30"
+            value={input}
+            onChange={(e) => onInputChange(e.target.value)}
+            disabled={status === 'streaming' || status === 'submitted'}
+          />
+        </div>
+
+        <div className="w-full max-w-4xl space-y-4 mt-16">
+          <h3 className="text-lg font-normal text-center">Get started with examples</h3>
+
+          <div className="grid grid-cols-2 md:grid-cols-3 gap-3 max-w-3xl mx-auto">
+            {AUTOMATION_EXAMPLES.map((example: AutomationExample) => (
+              <Card
+                key={example.title}
+                className="cursor-pointer transition-all duration-200 hover:scale-[1.02] hover:shadow-xl"
+                onClick={() => onExampleClick(example.prompt)}
+              >
+                <CardHeader className="p-4">
+                  <div className="flex items-start gap-3">
+                    <Image
+                      src={example.url}
+                      alt={example.title}
+                      width={24}
+                      height={24}
+                      className="rounded-sm"
+                    />
+                    <CardDescription className="flex-1">
+                      <p className="text-sm font-normal text-foreground leading-relaxed">
+                        {example.title}
+                      </p>
+                    </CardDescription>
+                  </div>
+                </CardHeader>
+              </Card>
+            ))}
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+}
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/chat/message-part/index.tsx b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/chat/message-part/index.tsx
similarity index 100%
rename from apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/chat/message-part/index.tsx
rename to apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/chat/message-part/index.tsx
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/chat/message-part/prompt-info.tsx b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/chat/message-part/prompt-info.tsx
similarity index 92%
rename from apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/chat/message-part/prompt-info.tsx
rename to apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/chat/message-part/prompt-info.tsx
index edc6d4f0b..b992f3b87 100644
--- a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/chat/message-part/prompt-info.tsx
+++ b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/chat/message-part/prompt-info.tsx
@@ -37,17 +37,19 @@ export const PromptInfo = memo(function PromptInfo({
       }
     : null;
 
+  const [isSubmitting, setIsSubmitting] = useState(false);
+  // If state is 'output-available', the info was already provided (historical message)
+  const [isComplete, setIsComplete] = useState(state === 'output-available');
+
+  // Initialize values from props only once on mount
   const [values, setValues] = useState<Record<string, string>>(() => {
+    if (!infoData?.fields) return {};
     const initial: Record<string, string> = {};
-    if (infoData?.fields) {
-      infoData.fields.forEach((field: FieldInfo) => {
-        initial[field.name] = field.defaultValue || '';
-      });
-    }
+    infoData.fields.forEach((field: FieldInfo) => {
+      initial[field.name] = field.defaultValue || '';
+    });
     return initial;
   });
-  const [isSubmitting, setIsSubmitting] = useState(false);
-  const [isComplete, setIsComplete] = useState(false);
 
   const handleSubmit = async () => {
     // Validate required fields
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/chat/message-part/prompt-secret.tsx b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/chat/message-part/prompt-secret.tsx
similarity index 93%
rename from apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/chat/message-part/prompt-secret.tsx
rename to apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/chat/message-part/prompt-secret.tsx
index f375471a5..76f7c38b4 100644
--- a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/chat/message-part/prompt-secret.tsx
+++ b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/chat/message-part/prompt-secret.tsx
@@ -33,12 +33,13 @@ export const PromptSecret = memo(function PromptSecret({
       }
     : null;
 
-  // Use the secret name from AI or allow user to set one
-  const [name, setName] = useState(secretData?.secretName || '');
+  // Use the secret name from AI or allow user to set one - initialize on mount only
+  const [name, setName] = useState(() => secretData?.secretName || '');
   const [value, setValue] = useState('');
-  const [description, setDescription] = useState(secretData?.description || '');
+  const [description, setDescription] = useState(() => secretData?.description || '');
   const [isSubmitting, setIsSubmitting] = useState(false);
-  const [isComplete, setIsComplete] = useState(false);
+  // If state is 'output-available', the secret was already added (historical message)
+  const [isComplete, setIsComplete] = useState(state === 'output-available');
 
   // Use the provided secret name or the user-entered one
   const finalSecretName = secretData?.secretName || name;
@@ -60,8 +61,6 @@ export const PromptSecret = memo(function PromptSecret({
         organizationId: orgId,
       };
 
-      console.log('Creating secret with payload:', { ...payload, value: '[REDACTED]' });
-
       const response = await fetch('/api/secrets', {
         method: 'POST',
         headers: {
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/chat/message-part/reasoning.tsx b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/chat/message-part/reasoning.tsx
similarity index 100%
rename from apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/chat/message-part/reasoning.tsx
rename to apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/chat/message-part/reasoning.tsx
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/chat/message-part/report-errors.tsx b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/chat/message-part/report-errors.tsx
similarity index 100%
rename from apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/chat/message-part/report-errors.tsx
rename to apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/chat/message-part/report-errors.tsx
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/chat/message-part/research-activity.tsx b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/chat/message-part/research-activity.tsx
similarity index 100%
rename from apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/chat/message-part/research-activity.tsx
rename to apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/chat/message-part/research-activity.tsx
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/chat/message-part/spinner.tsx b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/chat/message-part/spinner.tsx
similarity index 100%
rename from apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/chat/message-part/spinner.tsx
rename to apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/chat/message-part/spinner.tsx
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/chat/message-part/text.tsx b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/chat/message-part/text.tsx
similarity index 100%
rename from apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/chat/message-part/text.tsx
rename to apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/chat/message-part/text.tsx
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/chat/message-spinner.tsx b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/chat/message-spinner.tsx
similarity index 100%
rename from apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/chat/message-spinner.tsx
rename to apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/chat/message-spinner.tsx
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/chat/message.tsx b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/chat/message.tsx
similarity index 100%
rename from apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/chat/message.tsx
rename to apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/chat/message.tsx
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/chat/tool-header.tsx b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/chat/tool-header.tsx
similarity index 100%
rename from apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/chat/tool-header.tsx
rename to apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/chat/tool-header.tsx
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/chat/tool-message.tsx b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/chat/tool-message.tsx
similarity index 100%
rename from apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/chat/tool-message.tsx
rename to apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/chat/tool-message.tsx
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/chat/types.tsx b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/chat/types.tsx
similarity index 100%
rename from apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/chat/types.tsx
rename to apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/chat/types.tsx
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/icons/github.tsx b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/icons/github.tsx
similarity index 100%
rename from apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/icons/github.tsx
rename to apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/icons/github.tsx
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/icons/vercel-dashed.tsx b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/icons/vercel-dashed.tsx
similarity index 100%
rename from apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/icons/vercel-dashed.tsx
rename to apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/icons/vercel-dashed.tsx
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/layout/panels.tsx b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/layout/panels.tsx
similarity index 100%
rename from apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/layout/panels.tsx
rename to apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/layout/panels.tsx
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/layout/sizing.ts b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/layout/sizing.ts
similarity index 100%
rename from apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/layout/sizing.ts
rename to apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/layout/sizing.ts
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/markdown-renderer/markdown-renderer.tsx b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/markdown-renderer/markdown-renderer.tsx
similarity index 100%
rename from apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/markdown-renderer/markdown-renderer.tsx
rename to apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/markdown-renderer/markdown-renderer.tsx
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/model-selector/model-selector.tsx b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/model-selector/model-selector.tsx
similarity index 100%
rename from apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/model-selector/model-selector.tsx
rename to apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/model-selector/model-selector.tsx
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/model-selector/use-available-models.tsx b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/model-selector/use-available-models.tsx
similarity index 100%
rename from apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/model-selector/use-available-models.tsx
rename to apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/model-selector/use-available-models.tsx
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/panels/panels.tsx b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/panels/panels.tsx
similarity index 100%
rename from apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/panels/panels.tsx
rename to apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/panels/panels.tsx
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/preview/preview.tsx b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/preview/preview.tsx
similarity index 100%
rename from apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/preview/preview.tsx
rename to apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/preview/preview.tsx
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/tabs/index.tsx b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/tabs/index.tsx
similarity index 100%
rename from apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/tabs/index.tsx
rename to apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/tabs/index.tsx
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/tabs/tab-content.tsx b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/tabs/tab-content.tsx
similarity index 100%
rename from apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/tabs/tab-content.tsx
rename to apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/tabs/tab-content.tsx
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/tabs/tab-item.tsx b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/tabs/tab-item.tsx
similarity index 100%
rename from apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/tabs/tab-item.tsx
rename to apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/tabs/tab-item.tsx
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/tabs/use-tab-state.ts b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/tabs/use-tab-state.ts
similarity index 100%
rename from apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/tabs/use-tab-state.ts
rename to apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/tabs/use-tab-state.ts
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/ui/badge.tsx b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/ui/badge.tsx
similarity index 100%
rename from apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/ui/badge.tsx
rename to apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/ui/badge.tsx
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/ui/button.tsx b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/ui/button.tsx
similarity index 100%
rename from apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/ui/button.tsx
rename to apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/ui/button.tsx
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/ui/checkbox.tsx b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/ui/checkbox.tsx
similarity index 100%
rename from apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/ui/checkbox.tsx
rename to apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/ui/checkbox.tsx
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/ui/dialog.tsx b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/ui/dialog.tsx
similarity index 100%
rename from apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/ui/dialog.tsx
rename to apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/ui/dialog.tsx
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/ui/input.tsx b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/ui/input.tsx
similarity index 100%
rename from apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/ui/input.tsx
rename to apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/ui/input.tsx
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/ui/label.tsx b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/ui/label.tsx
similarity index 100%
rename from apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/ui/label.tsx
rename to apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/ui/label.tsx
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/ui/popover.tsx b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/ui/popover.tsx
similarity index 100%
rename from apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/ui/popover.tsx
rename to apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/ui/popover.tsx
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/ui/scroll-area.tsx b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/ui/scroll-area.tsx
similarity index 100%
rename from apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/ui/scroll-area.tsx
rename to apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/ui/scroll-area.tsx
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/ui/select.tsx b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/ui/select.tsx
similarity index 100%
rename from apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/ui/select.tsx
rename to apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/ui/select.tsx
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/ui/sonner.tsx b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/ui/sonner.tsx
similarity index 100%
rename from apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/ui/sonner.tsx
rename to apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/ui/sonner.tsx
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/ui/textarea.tsx b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/ui/textarea.tsx
similarity index 100%
rename from apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/ui/textarea.tsx
rename to apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/ui/textarea.tsx
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/workflow/components/CodeViewer.tsx b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/workflow/components/CodeViewer.tsx
similarity index 100%
rename from apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/workflow/components/CodeViewer.tsx
rename to apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/workflow/components/CodeViewer.tsx
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/workflow/components/ConfettiEffect.tsx b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/workflow/components/ConfettiEffect.tsx
similarity index 100%
rename from apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/workflow/components/ConfettiEffect.tsx
rename to apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/workflow/components/ConfettiEffect.tsx
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/workflow/components/EmptyState.tsx b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/workflow/components/EmptyState.tsx
similarity index 100%
rename from apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/workflow/components/EmptyState.tsx
rename to apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/workflow/components/EmptyState.tsx
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/workflow/components/TestDialog.tsx b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/workflow/components/TestDialog.tsx
similarity index 100%
rename from apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/workflow/components/TestDialog.tsx
rename to apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/workflow/components/TestDialog.tsx
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/workflow/components/TestResultsPanel.tsx b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/workflow/components/TestResultsPanel.tsx
similarity index 100%
rename from apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/workflow/components/TestResultsPanel.tsx
rename to apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/workflow/components/TestResultsPanel.tsx
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/workflow/components/UnifiedWorkflowCard.tsx b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/workflow/components/UnifiedWorkflowCard.tsx
similarity index 97%
rename from apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/workflow/components/UnifiedWorkflowCard.tsx
rename to apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/workflow/components/UnifiedWorkflowCard.tsx
index a5558ebb4..ebeea30e2 100644
--- a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/workflow/components/UnifiedWorkflowCard.tsx
+++ b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/workflow/components/UnifiedWorkflowCard.tsx
@@ -4,7 +4,6 @@ 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 { TaskAutomationWorkflow } from '../../../lib';
 
 interface WorkflowStep {
   id: string;
@@ -27,7 +26,9 @@ interface Props {
   steps: WorkflowStep[];
   title: string;
   onTest?: () => void;
-  integrationsUsed: TaskAutomationWorkflow['integrationsUsed'];
+  integrationsUsed: {
+    link: string;
+  }[];
 }
 
 export function UnifiedWorkflowCard({ steps, title, onTest, integrationsUsed }: Props) {
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/workflow/components/ViewModeSwitch.tsx b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/workflow/components/ViewModeSwitch.tsx
similarity index 100%
rename from apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/workflow/components/ViewModeSwitch.tsx
rename to apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/workflow/components/ViewModeSwitch.tsx
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/workflow/components/WorkflowSkeleton.tsx b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/workflow/components/WorkflowSkeleton.tsx
similarity index 100%
rename from apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/workflow/components/WorkflowSkeleton.tsx
rename to apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/workflow/components/WorkflowSkeleton.tsx
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/workflow/components/WorkflowStepCard.tsx b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/workflow/components/WorkflowStepCard.tsx
similarity index 100%
rename from apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/workflow/components/WorkflowStepCard.tsx
rename to apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/workflow/components/WorkflowStepCard.tsx
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/workflow/components/index.ts b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/workflow/components/index.ts
similarity index 100%
rename from apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/workflow/components/index.ts
rename to apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/workflow/components/index.ts
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/workflow/types.ts b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/workflow/types.ts
similarity index 100%
rename from apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/workflow/types.ts
rename to apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/workflow/types.ts
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/workflow/workflow-loading.tsx b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/workflow/workflow-loading.tsx
similarity index 100%
rename from apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/workflow/workflow-loading.tsx
rename to apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/workflow/workflow-loading.tsx
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/workflow/workflow-visualizer-simple.tsx b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/workflow/workflow-visualizer-simple.tsx
similarity index 56%
rename from apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/workflow/workflow-visualizer-simple.tsx
rename to apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/workflow/workflow-visualizer-simple.tsx
index 6b4954e07..d33f12521 100644
--- a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/components/workflow/workflow-visualizer-simple.tsx
+++ b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/workflow/workflow-visualizer-simple.tsx
@@ -3,18 +3,39 @@
 import { cn } from '@/lib/utils';
 import { useChat } from '@ai-sdk/react';
 import { Button } from '@comp/ui/button';
-import { Code, Play, Zap } from 'lucide-react';
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+} from '@comp/ui/dialog';
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuLabel,
+  DropdownMenuSeparator,
+  DropdownMenuTrigger,
+} from '@comp/ui/dropdown-menu';
+import { EvidenceAutomationVersion } from '@db';
+import { Code, Loader2, RotateCcw, Upload, Zap } from 'lucide-react';
 import { useParams } from 'next/navigation';
-import { useEffect, useMemo } from 'react';
+import { useEffect, useMemo, useState } from 'react';
+import { toast } from 'sonner';
+import { restoreVersion } from '../../actions/task-automation-actions';
 import {
+  useTaskAutomationAnalyze,
   useTaskAutomationExecution,
   useTaskAutomationScript,
-  useTaskAutomationWorkflow,
 } from '../../hooks';
+import { useAutomationVersions } from '../../hooks/use-automation-versions';
 import { useSharedChatContext } from '../../lib/chat-context';
 import { useTaskAutomationStore } from '../../lib/task-automation-store';
 import type { ChatUIMessage } from '../chat/types';
 import { Panel, PanelHeader } from '../panels/panels';
+import { PublishDialog } from '../PublishDialog';
 import {
   CodeViewer,
   EmptyState,
@@ -31,9 +52,17 @@ interface Props {
 
 export function WorkflowVisualizerSimple({ className }: Props) {
   const { scriptGenerated, viewMode, setViewMode, setScriptUrl } = useTaskAutomationStore();
-  const { orgId, taskId } = useParams<{ orgId: string; taskId: string }>();
+  const { orgId, taskId, automationId } = useParams<{
+    orgId: string;
+    taskId: string;
+    automationId: string;
+  }>();
   const { chat } = useSharedChatContext();
   const { sendMessage } = useChat<ChatUIMessage>({ chat });
+  const [publishDialogOpen, setPublishDialogOpen] = useState(false);
+  const [isRestoring, setIsRestoring] = useState(false);
+  const [confirmRestore, setConfirmRestore] = useState<EvidenceAutomationVersion | null>(null);
+  const { versions } = useAutomationVersions();
 
   const {
     script,
@@ -42,9 +71,32 @@ export function WorkflowVisualizerSimple({ className }: Props) {
   } = useTaskAutomationScript({
     orgId: orgId,
     taskId: taskId,
-    enabled: !!orgId && !!taskId,
+    automationId: automationId,
+    enabled: !!orgId && !!taskId && !!automationId,
   });
 
+  const handleRestoreVersion = async (version: EvidenceAutomationVersion) => {
+    setIsRestoring(true);
+
+    try {
+      const result = await restoreVersion(orgId, taskId, automationId, version.version);
+
+      if (!result.success) {
+        throw new Error(result.error || 'Failed to restore version');
+      }
+
+      toast.success(`Draft overwritten with version ${version.version}`);
+      setConfirmRestore(null);
+
+      // Refresh the script to show the restored content
+      await refresh();
+    } catch (error) {
+      toast.error(error instanceof Error ? error.message : 'Failed to restore version');
+    } finally {
+      setIsRestoring(false);
+    }
+  };
+
   useEffect(() => {
     const handleScriptSaved = () => refresh();
     window.addEventListener('task-automation:script-saved', handleScriptSaved);
@@ -69,9 +121,9 @@ export function WorkflowVisualizerSimple({ className }: Props) {
     result: executionResult,
     error: executionError,
     reset: resetExecution,
-  } = useTaskAutomationExecution({ orgId: orgId, taskId: taskId });
+  } = useTaskAutomationExecution();
 
-  const { steps, isAnalyzing, integrationsUsed, title } = useTaskAutomationWorkflow({
+  const { steps, isAnalyzing, integrationsUsed, title } = useTaskAutomationAnalyze({
     scriptContent: script?.content,
     enabled: !!script?.content,
   });
@@ -134,7 +186,15 @@ Please fix the automation script to resolve this error.`;
     // Send the error to the chat
     sendMessage(
       { text: errorMessage },
-      { body: { modelId: 'openai/gpt-5-mini', reasoningEffort: 'medium', orgId, taskId } },
+      {
+        body: {
+          modelId: 'openai/gpt-5-mini',
+          reasoningEffort: 'medium',
+          orgId,
+          taskId,
+          automationId,
+        },
+      },
     );
 
     // Close the dialog
@@ -176,15 +236,46 @@ Please fix the automation script to resolve this error.`;
           <div className="flex items-center gap-2">
             <ViewModeSwitch value={viewMode} onChange={setViewMode} />
             {script && !showEmptyState && (
-              <Button
-                size="sm"
-                onClick={handleTest}
-                disabled={isExecuting || !script}
-                variant="outline"
-              >
-                <Play className={cn('w-4 h-4', isExecuting && 'animate-pulse')} />
-                {isExecuting ? `Testing...` : `Test`}
-              </Button>
+              <>
+                {versions && versions.length > 0 && (
+                  <DropdownMenu>
+                    <DropdownMenuTrigger asChild>
+                      <Button
+                        variant="outline"
+                        size="icon"
+                        disabled={isRestoring}
+                        title="Rollback to version"
+                      >
+                        <RotateCcw className="h-4 w-4" />
+                      </Button>
+                    </DropdownMenuTrigger>
+                    <DropdownMenuContent align="end" className="w-56">
+                      <DropdownMenuLabel>Overwrite draft with version</DropdownMenuLabel>
+                      <DropdownMenuSeparator />
+                      {versions.map((version) => (
+                        <DropdownMenuItem
+                          key={version.id}
+                          onClick={() => setConfirmRestore(version)}
+                          className="cursor-pointer"
+                        >
+                          <div className="flex flex-col gap-1">
+                            <span className="text-sm font-medium">Version {version.version}</span>
+                            {version.changelog && (
+                              <span className="text-xs text-muted-foreground line-clamp-1">
+                                {version.changelog}
+                              </span>
+                            )}
+                          </div>
+                        </DropdownMenuItem>
+                      ))}
+                    </DropdownMenuContent>
+                  </DropdownMenu>
+                )}
+                <Button size="sm" onClick={() => setPublishDialogOpen(true)}>
+                  <Upload className="h-4 w-4 mr-2" />
+                  Publish
+                </Button>
+              </>
             )}
           </div>
         </div>
@@ -215,9 +306,9 @@ Please fix the automation script to resolve this error.`;
                 ) : steps.length > 0 ? (
                   <UnifiedWorkflowCard
                     steps={steps}
-                    title={title}
+                    title={title || 'Automation Workflow'}
                     onTest={handleTest}
-                    integrationsUsed={integrationsUsed}
+                    integrationsUsed={integrationsUsed || []}
                   />
                 ) : (
                   <EmptyState type="workflow" />
@@ -232,6 +323,34 @@ Please fix the automation script to resolve this error.`;
           </div>
         )}
       </div>
+
+      <PublishDialog open={publishDialogOpen} onOpenChange={setPublishDialogOpen} />
+
+      <Dialog open={!!confirmRestore} onOpenChange={(open) => !open && setConfirmRestore(null)}>
+        <DialogContent>
+          <DialogHeader>
+            <DialogTitle>Overwrite Draft with Version {confirmRestore?.version}?</DialogTitle>
+            <DialogDescription>
+              This will replace your current draft with the script from version{' '}
+              {confirmRestore?.version}. This action is irreversible - your current draft will be
+              permanently lost.
+            </DialogDescription>
+          </DialogHeader>
+          <DialogFooter>
+            <Button variant="outline" onClick={() => setConfirmRestore(null)}>
+              Cancel
+            </Button>
+            <Button
+              onClick={() => confirmRestore && handleRestoreVersion(confirmRestore)}
+              variant="destructive"
+              disabled={isRestoring}
+            >
+              {isRestoring && <Loader2 className="h-4 w-4 mr-2 animate-spin" />}
+              {isRestoring ? 'Overwriting...' : 'Overwrite Draft'}
+            </Button>
+          </DialogFooter>
+        </DialogContent>
+      </Dialog>
     </Panel>
   );
 }
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/constants/automation-examples.ts b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/constants/automation-examples.ts
new file mode 100644
index 000000000..86118babd
--- /dev/null
+++ b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/constants/automation-examples.ts
@@ -0,0 +1,33 @@
+export interface AutomationExample {
+  title: string;
+  prompt: string;
+  url: string;
+}
+
+export const AUTOMATION_EXAMPLES: AutomationExample[] = [
+  {
+    title: 'Check if I have dependabot enabled in my GitHub repository',
+    prompt: 'Check if I have dependabot enabled in my GitHub repository',
+    url: 'https://img.logo.dev/github.com?token=pk_AZatYxV5QDSfWpRDaBxzRQ',
+  },
+  {
+    title: 'Check if I have branch protection enabled for the main branch in my GitHub repository',
+    prompt: 'Check if I have branch protection enabled for the main branch in my GitHub repository',
+    url: 'https://img.logo.dev/github.com?token=pk_AZatYxV5QDSfWpRDaBxzRQ',
+  },
+  {
+    title: 'Check if my website has a privacy policy',
+    prompt: 'Check if my website has a privacy policy',
+    url: 'https://img.logo.dev/trycomp.ai?token=pk_AZatYxV5QDSfWpRDaBxzRQ',
+  },
+  {
+    title: 'Give me a list of failed deployments in my Vercel project',
+    prompt: 'Give me a list of failed deployments in my Vercel project',
+    url: 'https://img.logo.dev/vercel.com?token=pk_AZatYxV5QDSfWpRDaBxzRQ',
+  },
+  {
+    title: 'Check that DDoS protection is enabled for my Cloudflare project',
+    prompt: 'Check that DDoS protection is enabled for my Cloudflare project',
+    url: 'https://img.logo.dev/cloudflare.com?token=pk_AZatYxV5QDSfWpRDaBxzRQ',
+  },
+];
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/hooks/index.ts b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/hooks/index.ts
similarity index 66%
rename from apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/hooks/index.ts
rename to apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/hooks/index.ts
index 6ee556d8f..d1168b1d5 100644
--- a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/hooks/index.ts
+++ b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/hooks/index.ts
@@ -1,3 +1,3 @@
+export { useTaskAutomationAnalyze } from './use-task-automation-analyze';
 export { useTaskAutomationExecution } from './use-task-automation-execution';
 export { useTaskAutomationScript } from './use-task-automation-script';
-export { useTaskAutomationWorkflow } from './use-task-automation-workflow';
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/hooks/use-automation-versions.ts b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/hooks/use-automation-versions.ts
new file mode 100644
index 000000000..d326455ad
--- /dev/null
+++ b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/hooks/use-automation-versions.ts
@@ -0,0 +1,130 @@
+import { api } from '@/lib/api-client';
+import { EvidenceAutomationVersion } from '@db';
+import { useParams } from 'next/navigation';
+import { useCallback, useState } from 'react';
+import useSWR from 'swr';
+
+interface UseAutomationVersionsOptions {
+  /**
+   * Number of versions to fetch per page
+   * @default 10
+   */
+  pageSize?: number;
+  /**
+   * Initial versions from server-side render (prevents loading flicker)
+   */
+  initialData?: EvidenceAutomationVersion[];
+}
+
+interface UseAutomationVersionsReturn {
+  /** Accumulated array of all loaded versions (sorted desc by version number) */
+  versions: EvidenceAutomationVersion[];
+  /** True while fetching initial page or loading more */
+  isLoading: boolean;
+  /** True if fetch failed */
+  isError: boolean;
+  /** Error object if fetch failed */
+  error: Error | undefined;
+  /** True if more versions exist that haven't been loaded yet */
+  hasMore: boolean;
+  /** Fetch the next page of versions (increments offset by pageSize) */
+  loadMore: () => Promise<void>;
+  /** Revalidate/refresh the versions list */
+  mutate: () => Promise<any>;
+}
+
+/**
+ * Fetch automation versions with infinite scroll pagination
+ *
+ * **Behavior:**
+ * - Initial load: Fetches first `pageSize` versions (default 10)
+ * - Incremental loading: Call `loadMore()` to fetch next page
+ * - Accumulation: New versions append to existing array
+ * - Smart detection: Sets `hasMore=false` when fewer than `pageSize` returned
+ * - Sorted: Versions returned in descending order (newest first)
+ *
+ * **Example:**
+ * ```tsx
+ * const { versions, hasMore, loadMore } = useAutomationVersions();
+ * // versions = [v10, v9, v8, v7, v6, v5, v4, v3, v2, v1]
+ *
+ * await loadMore(); // Fetches next 10
+ * // versions = [v10, v9, ..., v1] (accumulated)
+ * ```
+ *
+ * **Scalability:**
+ * - Handles 500+ versions efficiently
+ * - Only fetches what's needed
+ * - SWR caching per offset
+ *
+ * @param options - Configuration options
+ * @param options.pageSize - Number of versions per page (default: 10)
+ * @returns Version data, loading state, and loadMore function
+ */
+export function useAutomationVersions(
+  options: UseAutomationVersionsOptions = {},
+): UseAutomationVersionsReturn {
+  const { pageSize = 10, initialData = [] } = options;
+
+  const { orgId, taskId, automationId } = useParams<{
+    orgId: string;
+    taskId: string;
+    automationId: string;
+  }>();
+
+  const [allVersions, setAllVersions] = useState<EvidenceAutomationVersion[]>(initialData);
+  const [offset, setOffset] = useState(0);
+  const [hasMore, setHasMore] = useState(initialData.length === pageSize);
+
+  const { data, error, isLoading, mutate } = useSWR(
+    [`automation-versions-${automationId}-${offset}`, orgId, taskId, automationId, offset],
+    async () => {
+      const url = `/v1/tasks/${taskId}/automations/${automationId}/versions?limit=${pageSize}&offset=${offset}`;
+      const response = await api.get<{
+        success: boolean;
+        versions: EvidenceAutomationVersion[];
+      }>(url, orgId);
+
+      if (response.error) {
+        throw new Error(response.error);
+      }
+
+      if (!response.data?.success) {
+        throw new Error('Failed to fetch versions');
+      }
+
+      return response.data.versions;
+    },
+    {
+      revalidateOnFocus: false,
+      revalidateOnReconnect: true,
+      revalidateOnMount: true,
+      dedupingInterval: 0,
+      onSuccess: (newVersions) => {
+        // Append new versions to existing ones
+        if (offset === 0) {
+          setAllVersions(newVersions);
+        } else {
+          setAllVersions((prev) => [...prev, ...newVersions]);
+        }
+
+        // If we got fewer than pageSize, no more to load
+        setHasMore(newVersions.length === pageSize);
+      },
+    },
+  );
+
+  const loadMore = useCallback(async () => {
+    setOffset((prev) => prev + pageSize);
+  }, [pageSize]);
+
+  return {
+    versions: allVersions,
+    isLoading,
+    isError: !!error,
+    error: error as Error | undefined,
+    hasMore,
+    loadMore,
+    mutate,
+  };
+}
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/hooks/use-chat-handlers.ts b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/hooks/use-chat-handlers.ts
new file mode 100644
index 000000000..4e4cc9c96
--- /dev/null
+++ b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/hooks/use-chat-handlers.ts
@@ -0,0 +1,137 @@
+import { api } from '@/lib/api-client';
+import { useRouter } from 'next/navigation';
+import { useCallback } from 'react';
+import { toast } from 'sonner';
+import { mutate } from 'swr';
+
+interface UseChatHandlersProps {
+  sendMessage: (message: { text: string }, options?: any) => void;
+  setInput: (value: string) => void;
+  orgId: string;
+  taskId: string;
+  automationId: string;
+  isEphemeral: boolean;
+  updateAutomationId: (newId: string) => void;
+}
+
+export function useChatHandlers({
+  sendMessage,
+  setInput,
+  orgId,
+  taskId,
+  automationId,
+  isEphemeral,
+  updateAutomationId,
+}: UseChatHandlersProps) {
+  const router = useRouter();
+
+  const validateAndSubmitMessage = useCallback(
+    async (text: string) => {
+      if (!text.trim()) return;
+
+      let realAutomationId = automationId;
+
+      // If ephemeral, create the automation first (but don't redirect)
+      if (isEphemeral) {
+        try {
+          const response = await api.post<{
+            success: boolean;
+            automation: {
+              id: string;
+              name: string;
+            };
+          }>(`/v1/tasks/${taskId}/automations`, {}, orgId);
+
+          if (response.error || !response.data?.success) {
+            throw new Error(response.error || 'Failed to create automation');
+          }
+
+          realAutomationId = response.data.automation.id;
+
+          // Update the automation ID in ChatProvider immediately
+          updateAutomationId(realAutomationId);
+
+          // Invalidate automations list cache so task page updates
+          mutate([`task-automations-${taskId}`, orgId, taskId]);
+
+          // Silently replace the URL without navigation/reload
+          window.history.replaceState(
+            null,
+            '',
+            `/${orgId}/tasks/${taskId}/automation/${realAutomationId}`,
+          );
+        } catch (error) {
+          toast.error(error instanceof Error ? error.message : 'Failed to create automation');
+          return;
+        }
+      }
+
+      // Send the message with the real (or existing) automation ID
+      sendMessage(
+        { text },
+        {
+          body: {
+            modelId: 'openai/gpt-5-mini',
+            reasoningEffort: 'medium',
+            orgId,
+            taskId,
+            automationId: realAutomationId,
+          },
+        },
+      );
+
+      setInput('');
+    },
+    [sendMessage, setInput, orgId, taskId, automationId, isEphemeral, updateAutomationId],
+  );
+
+  const handleSecretAdded = useCallback(
+    (secretName: string) => {
+      sendMessage(
+        {
+          text: `I've added the secret "${secretName}". You can now use it in the automation script.`,
+        },
+        {
+          body: {
+            modelId: 'openai/gpt-5-mini',
+            reasoningEffort: 'medium',
+            orgId,
+            taskId,
+            automationId,
+          },
+        },
+      );
+    },
+    [sendMessage, orgId, taskId, automationId],
+  );
+
+  const handleInfoProvided = useCallback(
+    (info: Record<string, string>) => {
+      const infoText = Object.entries(info)
+        .map(([key, value]) => `${key}: ${value}`)
+        .join('\n');
+
+      sendMessage(
+        {
+          text: `I've provided the following information:\n\n${infoText}\n\nYou can now continue with creating the automation script.`,
+        },
+        {
+          body: {
+            modelId: 'openai/gpt-5-mini',
+            reasoningEffort: 'medium',
+            orgId,
+            taskId,
+            automationId,
+          },
+        },
+      );
+    },
+    [sendMessage, orgId, taskId, automationId],
+  );
+
+  return {
+    validateAndSubmitMessage,
+    handleSecretAdded,
+    handleInfoProvided,
+  };
+}
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/hooks/use-task-automation-workflow.ts b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/hooks/use-task-automation-analyze.ts
similarity index 79%
rename from apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/hooks/use-task-automation-workflow.ts
rename to apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/hooks/use-task-automation-analyze.ts
index a2f4e4552..8f695601b 100644
--- a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/hooks/use-task-automation-workflow.ts
+++ b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/hooks/use-task-automation-analyze.ts
@@ -1,12 +1,12 @@
 /**
- * useTaskAutomationWorkflow Hook
+ * useTaskAutomationAnalyze Hook
  *
  * Analyzes task automation scripts to extract workflow steps and descriptions.
  * Provides both client-side parsing and future support for AI-powered analysis.
  *
  * @example
  * ```tsx
- * const { steps, description, isAnalyzing } = useTaskAutomationWorkflow({
+ * const { steps, description, isAnalyzing } = useTaskAutomationAnalyze({
  *   scriptContent: scriptContent,
  *   enabled: !!scriptContent
  * });
@@ -15,28 +15,28 @@
 
 import { useCallback, useEffect, useState } from 'react';
 import type {
-  TaskAutomationWorkflow,
-  TaskAutomationWorkflowStep,
-  UseTaskAutomationWorkflowOptions,
+  TaskAutomationAnalyze,
+  TaskAutomationAnalyzeStep,
+  UseTaskAutomationAnalyzeOptions,
 } from '../lib/types';
 
 import { taskAutomationApi } from '../lib/task-automation-api';
 
-export function useTaskAutomationWorkflow({
+export function useTaskAutomationAnalyze({
   scriptContent,
   enabled = true,
-}: UseTaskAutomationWorkflowOptions) {
-  const [steps, setSteps] = useState<TaskAutomationWorkflowStep[]>([]);
+}: UseTaskAutomationAnalyzeOptions) {
+  const [steps, setSteps] = useState<TaskAutomationAnalyzeStep[]>([]);
   const [title, setTitle] = useState<string>('');
   const [integrationsUsed, setIntegrationsUsed] = useState<
-    TaskAutomationWorkflow['integrationsUsed']
+    TaskAutomationAnalyze['integrationsUsed']
   >([]);
   const [description, setDescription] = useState<string>('');
   const [isAnalyzing, setIsAnalyzing] = useState(false);
   const [error, setError] = useState<Error | null>(null);
 
   /**
-   * Analyze the script content to extract workflow using AI
+   * Analyze the script content using AI
    */
   const analyze = useCallback(async (content: string) => {
     setIsAnalyzing(true);
@@ -46,15 +46,15 @@ export function useTaskAutomationWorkflow({
       // Call the AI-powered workflow analysis API
       const result = (await taskAutomationApi.workflow.analyzeWorkflow(
         content,
-      )) as TaskAutomationWorkflow;
+      )) as TaskAutomationAnalyze;
 
       // Map the API response to our workflow steps format
-      const steps: TaskAutomationWorkflowStep[] = result.steps.map((step, index) => ({
+      const steps: TaskAutomationAnalyzeStep[] = result.steps.map((step, index) => ({
         id: `step-${index}`,
         title: step.title,
         description: step.description,
-        type: step.type as TaskAutomationWorkflowStep['type'],
-        iconType: step.iconType as TaskAutomationWorkflowStep['iconType'],
+        type: step.type as TaskAutomationAnalyzeStep['type'],
+        iconType: step.iconType as TaskAutomationAnalyzeStep['iconType'],
       }));
 
       setSteps(steps);
@@ -68,7 +68,7 @@ export function useTaskAutomationWorkflow({
       setError(error);
 
       // Fallback to a generic workflow on error
-      const fallbackSteps: TaskAutomationWorkflowStep[] = [
+      const fallbackSteps: TaskAutomationAnalyzeStep[] = [
         {
           id: 'start',
           title: 'Start Automation',
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/hooks/use-task-automation-execution.ts b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/hooks/use-task-automation-execution.ts
similarity index 93%
rename from apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/hooks/use-task-automation-execution.ts
rename to apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/hooks/use-task-automation-execution.ts
index abb5acabc..9df969afb 100644
--- a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/hooks/use-task-automation-execution.ts
+++ b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/hooks/use-task-automation-execution.ts
@@ -18,6 +18,7 @@
  * ```
  */
 
+import { useParams } from 'next/navigation';
 import { useCallback, useEffect, useRef, useState } from 'react';
 import { taskAutomationApi } from '../lib/task-automation-api';
 import type {
@@ -26,11 +27,14 @@ import type {
 } from '../lib/types';
 
 export function useTaskAutomationExecution({
-  orgId,
-  taskId,
   onSuccess,
   onError,
-}: UseTaskAutomationExecutionOptions) {
+}: UseTaskAutomationExecutionOptions = {}) {
+  const { orgId, taskId, automationId } = useParams<{
+    orgId: string;
+    taskId: string;
+    automationId: string;
+  }>();
   const [runId, setRunId] = useState<string | null>(null);
   const [isExecuting, setIsExecuting] = useState(false);
   const [result, setResult] = useState<TaskAutomationExecutionResult | null>(null);
@@ -105,7 +109,11 @@ export function useTaskAutomationExecution({
     setRunId(null);
 
     try {
-      const response = await taskAutomationApi.execution.executeScript({ orgId, taskId });
+      const response = await taskAutomationApi.execution.executeScript({
+        orgId,
+        taskId,
+        automationId,
+      });
 
       // The API now returns a run ID that we can monitor
       if (
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/hooks/use-task-automation-script.ts b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/hooks/use-task-automation-script.ts
similarity index 93%
rename from apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/hooks/use-task-automation-script.ts
rename to apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/hooks/use-task-automation-script.ts
index e75f6bc3b..9c79bc0fe 100644
--- a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/hooks/use-task-automation-script.ts
+++ b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/hooks/use-task-automation-script.ts
@@ -20,9 +20,10 @@ import { taskAutomationApi } from '../lib/task-automation-api';
 export function useTaskAutomationScript({
   orgId,
   taskId,
+  automationId,
   enabled = true,
 }: UseTaskAutomationScriptOptions) {
-  const scriptKey = `${orgId}/${taskId}.automation.js`;
+  const scriptKey = `${orgId}/${taskId}/${automationId}.draft.js`;
 
   const { data, error, isLoading, mutate } = useSWR<TaskAutomationScript>(
     enabled ? ['task-automation-script', scriptKey] : null,
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
new file mode 100644
index 000000000..66d9eb540
--- /dev/null
+++ b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/hooks/use-task-automation.ts
@@ -0,0 +1,66 @@
+import { api } from '@/lib/api-client';
+import { useParams } from 'next/navigation';
+import useSWR from 'swr';
+
+interface TaskAutomationData {
+  id: string;
+  name: string;
+  description?: string;
+  taskId: string;
+  organizationId: string;
+  status: string;
+  createdAt: string;
+  updatedAt: string;
+}
+
+interface UseTaskAutomationReturn {
+  automation: TaskAutomationData | undefined;
+  isLoading: boolean;
+  isError: boolean;
+  error: Error | undefined;
+  mutate: () => Promise<any>;
+}
+
+export function useTaskAutomation(): UseTaskAutomationReturn {
+  const { orgId, taskId, automationId } = useParams<{
+    orgId: string;
+    taskId: string;
+    automationId: string;
+  }>();
+
+  const { data, error, isLoading, mutate } = useSWR(
+    [`automation-${automationId}`, orgId, taskId, automationId],
+    async () => {
+      const response = await api.get<{
+        success: boolean;
+        automation: TaskAutomationData;
+      }>(`/v1/tasks/${taskId}/automations/${automationId}`, orgId);
+
+      if (response.error) {
+        throw new Error(response.error);
+      }
+
+      if (!response.data?.success) {
+        throw new Error('Failed to fetch automation');
+      }
+
+      return response.data.automation;
+    },
+    {
+      revalidateOnFocus: false,
+      revalidateOnReconnect: true,
+      shouldRetryOnError: (error) => {
+        // Don't retry on 404s
+        return !error?.message?.includes('404');
+      },
+    },
+  );
+
+  return {
+    automation: data,
+    isLoading,
+    isError: !!error,
+    error: error as Error | undefined,
+    mutate,
+  };
+}
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/layout.tsx b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/layout.tsx
similarity index 71%
rename from apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/layout.tsx
rename to apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/layout.tsx
index 9f5a3f66c..0cc0d0333 100644
--- a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/layout.tsx
+++ b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/layout.tsx
@@ -2,15 +2,12 @@ import { NuqsAdapter } from 'nuqs/adapters/next/app';
 import type { ReactNode } from 'react';
 import { Suspense } from 'react';
 import { Toaster } from './components/ui/sonner';
-import { ChatProvider } from './lib/chat-context';
 
 export default function RootLayout({ children }: Readonly<{ children: ReactNode }>) {
   return (
     <>
       <Suspense fallback={null}>
-        <NuqsAdapter>
-          <ChatProvider>{children}</ChatProvider>
-        </NuqsAdapter>
+        <NuqsAdapter>{children}</NuqsAdapter>
       </Suspense>
       <Toaster />
     </>
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/lib/chat-context.tsx b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/lib/chat-context.tsx
new file mode 100644
index 000000000..ddb3aa4f1
--- /dev/null
+++ b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/lib/chat-context.tsx
@@ -0,0 +1,102 @@
+'use client';
+
+import { Chat } from '@ai-sdk/react';
+import { DataUIPart, DefaultChatTransport } from 'ai';
+import { useParams } from 'next/navigation';
+import { createContext, useCallback, useContext, useRef, type ReactNode } from 'react';
+import { toast } from 'sonner';
+import { mutate } from 'swr';
+import { saveChatHistory } from '../actions/task-automation-actions';
+import { type ChatUIMessage } from '../components/chat/types';
+import { useTaskAutomationDataMapper } from './task-automation-store';
+import { DataPart } from './types/data-parts';
+
+interface ChatContextValue {
+  chat: Chat<ChatUIMessage>;
+  updateAutomationId: (newId: string) => void;
+}
+
+const ChatContext = createContext<ChatContextValue | undefined>(undefined);
+
+export function ChatProvider({
+  children,
+  initialMessages = [],
+}: {
+  children: ReactNode;
+  initialMessages?: any[];
+}) {
+  const mapDataToState = useTaskAutomationDataMapper();
+  const mapDataToStateRef = useRef(mapDataToState);
+  mapDataToStateRef.current = mapDataToState;
+
+  const baseUrl = process.env.NEXT_PUBLIC_ENTERPRISE_API_URL;
+  const url = `${baseUrl}/api/tasks-automations/chat`;
+
+  const { automationId } = useParams<{ automationId: string }>();
+
+  // Use ref to track the latest automation ID (important for ephemeral → real transition)
+  // Initialize once, don't overwrite on every render
+  const automationIdRef = useRef(automationId);
+  const hasBeenManuallyUpdated = useRef(false);
+
+  // Only update from params if it hasn't been manually set
+  if (!hasBeenManuallyUpdated.current) {
+    automationIdRef.current = automationId;
+  }
+
+  // Function to update automation ID (called when ephemeral becomes real)
+  const updateAutomationId = useCallback((newId: string) => {
+    console.log('[ChatProvider] Updating automation ID to:', newId);
+    automationIdRef.current = newId;
+    hasBeenManuallyUpdated.current = true;
+  }, []);
+
+  // Create Chat instance once with initial messages
+  const chatRef = useRef<Chat<ChatUIMessage> | null>(null);
+  if (!chatRef.current) {
+    chatRef.current = new Chat<ChatUIMessage>({
+      transport: new DefaultChatTransport({
+        api: url,
+      }),
+      messages: initialMessages,
+      onToolCall: () => mutate(`/api/auth/info`),
+      onData: (data: DataUIPart<DataPart>) => mapDataToStateRef.current(data),
+      onError: (error) => {
+        toast.error(`Communication error with the AI: ${error.message}`);
+        console.error('Error sending message:', error);
+      },
+      onFinish: async (event) => {
+        console.log('[Chat] onFinish triggered, saving to Redis...');
+
+        // Get the current automation ID from ref (handles URL updates via replaceState)
+        const currentAutomationId = automationIdRef.current;
+        console.log('[Chat] currentAutomationId:', currentAutomationId);
+
+        if (currentAutomationId === 'new') {
+          console.log('[Chat] Skipping save - ephemeral automation');
+          return;
+        }
+
+        const messagesToSave = event.messages;
+        console.log('[Chat] Saving to automation:', currentAutomationId);
+
+        const result = await saveChatHistory(currentAutomationId, messagesToSave || []);
+        console.log('[Chat] Save result:', result);
+      },
+    });
+  }
+
+  return (
+    <ChatContext.Provider value={{ chat: chatRef.current, updateAutomationId }}>
+      {children}
+    </ChatContext.Provider>
+  );
+}
+
+export function useSharedChatContext() {
+  const context = useContext(ChatContext);
+  if (!context) {
+    throw new Error('useSharedChatContext must be used within a ChatProvider');
+  }
+  return context;
+}
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/lib/deferred.ts b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/lib/deferred.ts
similarity index 100%
rename from apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/lib/deferred.ts
rename to apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/lib/deferred.ts
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/lib/index.ts b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/lib/index.ts
similarity index 100%
rename from apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/lib/index.ts
rename to apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/lib/index.ts
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/lib/is-relative-url.ts b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/lib/is-relative-url.ts
similarity index 100%
rename from apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/lib/is-relative-url.ts
rename to apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/lib/is-relative-url.ts
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/lib/task-automation-api.ts b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/lib/task-automation-api.ts
similarity index 100%
rename from apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/lib/task-automation-api.ts
rename to apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/lib/task-automation-api.ts
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/lib/task-automation-store.ts b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/lib/task-automation-store.ts
similarity index 94%
rename from apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/lib/task-automation-store.ts
rename to apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/lib/task-automation-store.ts
index 09f832a22..0a0cf4843 100644
--- a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/lib/task-automation-store.ts
+++ b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/lib/task-automation-store.ts
@@ -31,8 +31,7 @@ export const useTaskAutomationStore = create<TaskAutomationStore>()((set) => ({
   scriptUrl: undefined,
 
   // Actions
-  setChatStatus: (status) =>
-    set((state) => (state.chatStatus === status ? state : { chatStatus: status })),
+  setChatStatus: (status) => set({ chatStatus: status }),
 
   setScriptGenerated: (generated, path) =>
     set({
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/lib/types/data-parts.ts b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/lib/types/data-parts.ts
similarity index 100%
rename from apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/lib/types/data-parts.ts
rename to apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/lib/types/data-parts.ts
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/lib/types/index.ts b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/lib/types/index.ts
similarity index 88%
rename from apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/lib/types/index.ts
rename to apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/lib/types/index.ts
index eec4fea7e..8c7e2bb72 100644
--- a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/lib/types/index.ts
+++ b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/lib/types/index.ts
@@ -47,12 +47,12 @@ export interface TaskAutomationTestResult {
 }
 
 // ============================================================================
-// Workflow Types
+// Analyze Types
 // ============================================================================
 
-export type WorkflowStepType = 'trigger' | 'action' | 'condition' | 'output';
+export type AnalyzeStepType = 'trigger' | 'action' | 'condition' | 'output';
 
-export type WorkflowIconType =
+export type AnalyzeIconType =
   | 'start'
   | 'fetch'
   | 'login'
@@ -63,12 +63,12 @@ export type WorkflowIconType =
   | 'complete'
   | 'error';
 
-export interface TaskAutomationWorkflowStep {
+export interface TaskAutomationAnalyzeStep {
   id: string;
   title: string;
   description: string;
-  type: WorkflowStepType;
-  iconType: WorkflowIconType;
+  type: AnalyzeStepType;
+  iconType: AnalyzeIconType;
 }
 
 type IntegrationsUsed = Array<{
@@ -76,8 +76,8 @@ type IntegrationsUsed = Array<{
   link: string;
 }>;
 
-export interface TaskAutomationWorkflow {
-  steps: TaskAutomationWorkflowStep[];
+export interface TaskAutomationAnalyze {
+  steps: TaskAutomationAnalyzeStep[];
   title: string;
   description: string;
   integrationsUsed: IntegrationsUsed;
@@ -104,6 +104,7 @@ export interface TaskAutomationUploadResponse {
 export interface TaskAutomationExecuteRequest {
   orgId: string;
   taskId: string;
+  automationId: string;
 }
 
 // ============================================================================
@@ -129,6 +130,7 @@ export interface TaskAutomationStoreState {
 export interface UseTaskAutomationScriptOptions {
   orgId: string;
   taskId: string;
+  automationId: string;
   enabled?: boolean;
 }
 
@@ -138,13 +140,11 @@ export interface UseTaskAutomationScriptsListOptions {
 }
 
 export interface UseTaskAutomationExecutionOptions {
-  orgId: string;
-  taskId: string;
   onSuccess?: (result: TaskAutomationExecutionResult) => void;
   onError?: (error: Error) => void;
 }
 
-export interface UseTaskAutomationWorkflowOptions {
+export interface UseTaskAutomationAnalyzeOptions {
   scriptContent?: string;
   enabled?: boolean;
 }
@@ -158,7 +158,7 @@ export interface TaskAutomationTesterProps {
   orgId: string;
 }
 
-export interface TaskAutomationWorkflowVisualizerProps {
+export interface TaskAutomationAnalyzeVisualizerProps {
   className?: string;
 }
 
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/lib/types/metadata.ts b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/lib/types/metadata.ts
similarity index 100%
rename from apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/lib/types/metadata.ts
rename to apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/lib/types/metadata.ts
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/page.tsx b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/page.tsx
new file mode 100644
index 000000000..5009e7b48
--- /dev/null
+++ b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/page.tsx
@@ -0,0 +1,51 @@
+import { db } from '@db';
+import { redirect } from 'next/navigation';
+import { loadChatHistory } from './actions/task-automation-actions';
+import { AutomationLayoutWrapper } from './automation-layout-wrapper';
+import { AutomationPageClient } from './components/AutomationPageClient';
+import { ChatProvider } from './lib/chat-context';
+
+export default async function Page({
+  params,
+}: {
+  params: Promise<{ taskId: string; orgId: string; automationId: string }>;
+}) {
+  const { taskId, orgId, automationId } = await params;
+
+  const task = await db.task.findUnique({
+    where: {
+      id: taskId,
+      organizationId: orgId,
+    },
+  });
+
+  if (!task) {
+    redirect('/tasks');
+  }
+
+  const taskName = task.title;
+
+  // Load chat history server-side (skip for ephemeral 'new' automations)
+  let initialMessages = [];
+  if (automationId !== 'new') {
+    const historyResult = await loadChatHistory(automationId);
+    if (historyResult.success && historyResult.data?.messages) {
+      initialMessages = historyResult.data.messages;
+    }
+  }
+
+  return (
+    <ChatProvider initialMessages={initialMessages}>
+      <AutomationLayoutWrapper>
+        <div className="h-screen overflow-hidden">
+          <AutomationPageClient
+            orgId={orgId}
+            taskId={taskId}
+            automationId={automationId}
+            taskName={taskName}
+          />
+        </div>
+      </AutomationLayoutWrapper>
+    </ChatProvider>
+  );
+}
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/tools/exa-search.ts b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/tools/exa-search.ts
new file mode 100644
index 000000000..41db290f4
--- /dev/null
+++ b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/tools/exa-search.ts
@@ -0,0 +1,9 @@
+import { tool } from 'ai';
+import { z } from 'zod';
+
+export const exaSearchTool = () =>
+  tool({
+    description: 'Real tool is defined in enterprise api',
+    inputSchema: z.object({}),
+    execute: async () => {},
+  });
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/tools/firecrawl.ts b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/tools/firecrawl.ts
new file mode 100644
index 000000000..ca0ea9361
--- /dev/null
+++ b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/tools/firecrawl.ts
@@ -0,0 +1,9 @@
+import { tool } from 'ai';
+import { z } from 'zod';
+
+export const firecrawlTool = () =>
+  tool({
+    description: 'Real tool is defined in enterprise api',
+    inputSchema: z.object({}),
+    execute: async () => {},
+  });
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/tools/gateway.ts b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/tools/gateway.ts
similarity index 100%
rename from apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/tools/gateway.ts
rename to apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/tools/gateway.ts
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/tools/prompt-for-info.ts b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/tools/prompt-for-info.ts
new file mode 100644
index 000000000..716c87cb0
--- /dev/null
+++ b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/tools/prompt-for-info.ts
@@ -0,0 +1,10 @@
+import { tool } from 'ai';
+import { z } from 'zod';
+
+export function promptForInfoTool() {
+  return tool({
+    description: 'Real tool is defined in enterprise api',
+    inputSchema: z.object({}),
+    execute: async () => {},
+  });
+}
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/tools/prompt-for-secret.ts b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/tools/prompt-for-secret.ts
new file mode 100644
index 000000000..d0414dd29
--- /dev/null
+++ b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/tools/prompt-for-secret.ts
@@ -0,0 +1,9 @@
+import { tool } from 'ai';
+import { z } from 'zod';
+
+export const promptForSecretTool = () =>
+  tool({
+    description: 'Real tool is defined in enterprise api',
+    inputSchema: z.object({}),
+    execute: async () => {},
+  });
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/tools/store-to-s3.ts b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/tools/store-to-s3.ts
new file mode 100644
index 000000000..07933d284
--- /dev/null
+++ b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/tools/store-to-s3.ts
@@ -0,0 +1,11 @@
+import { tool } from 'ai';
+import z from 'zod';
+
+export const storeToS3 = () => {
+  const config = {
+    description: 'Real tool is defined in enterprise api',
+    inputSchema: z.object({}),
+    execute: async () => {},
+  } as const;
+  return tool(config as any);
+};
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/tools/task-automation-tools.ts b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/tools/task-automation-tools.ts
similarity index 92%
rename from apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/tools/task-automation-tools.ts
rename to apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/tools/task-automation-tools.ts
index 519e67e73..fc92c8307 100644
--- a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/tools/task-automation-tools.ts
+++ b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/tools/task-automation-tools.ts
@@ -27,9 +27,9 @@ interface Params {
  * - exaSearch: For searching the web using Exa AI's neural search
  * - firecrawl: For crawling and extracting content from websites
  */
-export function getTaskAutomationTools({ modelId, writer }: Params) {
+export function getTaskAutomationTools() {
   return {
-    storeToS3: storeToS3({ writer }),
+    storeToS3: storeToS3(),
     promptForSecret: promptForSecretTool(),
     promptForInfo: promptForInfoTool(),
     exaSearch: exaSearchTool(),
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/chat.tsx b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/chat.tsx
deleted file mode 100644
index 8e4849449..000000000
--- a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/chat.tsx
+++ /dev/null
@@ -1,297 +0,0 @@
-'use client';
-
-import { cn } from '@/lib/utils';
-import { useChat } from '@ai-sdk/react';
-import {
-  Breadcrumb,
-  BreadcrumbItem,
-  BreadcrumbLink,
-  BreadcrumbList,
-  BreadcrumbSeparator,
-} from '@comp/ui/breadcrumb';
-import { Card, CardDescription, CardHeader } from '@comp/ui/card';
-import { ChevronRight } from 'lucide-react';
-import Image from 'next/image';
-import Link from 'next/link';
-import { useCallback, useEffect, useRef, useState } from 'react';
-import {
-  Conversation,
-  ConversationContent,
-  ConversationScrollButton,
-} from './components/ai-elements/conversation';
-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 { useSharedChatContext } from './lib/chat-context';
-import { useTaskAutomationStore } from './lib/task-automation-store';
-
-interface Props {
-  className: string;
-  modelId?: string;
-  orgId: string;
-  taskId: string;
-  taskName?: string;
-}
-
-interface Example {
-  title: string;
-  prompt: string;
-  url: string;
-}
-
-const AUTOMATION_EXAMPLES: Example[] = [
-  {
-    title: 'Check if I have dependabot enabled in my GitHub repository',
-    prompt: 'Check if I have dependabot enabled in my GitHub repository',
-    url: 'https://img.logo.dev/github.com?token=pk_AZatYxV5QDSfWpRDaBxzRQ',
-  },
-  {
-    title: 'Check if I have branch protection enabled for the main branch in my GitHub repository',
-    prompt: 'Check if I have branch protection enabled for the main branch in my GitHub repository',
-    url: 'https://img.logo.dev/github.com?token=pk_AZatYxV5QDSfWpRDaBxzRQ',
-  },
-  {
-    title: 'Check if my website has a privacy policy',
-    prompt: 'Check if my website has a privacy policy',
-    url: 'https://img.logo.dev/trycomp.ai?token=pk_AZatYxV5QDSfWpRDaBxzRQ',
-  },
-  {
-    title: 'Give me a list of failed deployments in my Vercel project',
-    prompt: 'Give me a list of failed deployments in my Vercel project',
-    url: 'https://img.logo.dev/vercel.com?token=pk_AZatYxV5QDSfWpRDaBxzRQ',
-  },
-  {
-    title: 'Check that DDoS protection is enabled for my Cloudflare project',
-    prompt: 'Check that DDoS protection is enabled for my Cloudflare project',
-    url: 'https://img.logo.dev/cloudflare.com?token=pk_AZatYxV5QDSfWpRDaBxzRQ',
-  },
-];
-
-export function Chat({ className, orgId, taskId, taskName }: Props) {
-  const [input, setInput] = useState('');
-  const { chat } = useSharedChatContext();
-  const { messages, sendMessage, status } = useChat<ChatUIMessage>({ chat });
-  const { setChatStatus, scriptUrl } = useTaskAutomationStore();
-  const inputRef = useRef<HTMLInputElement | null>(null);
-
-  const handleExampleClick = useCallback(
-    (prompt: string) => {
-      setInput(prompt);
-      // Focus the input for immediate interaction
-      inputRef.current?.focus();
-    },
-    [setInput],
-  );
-
-  const validateAndSubmitMessage = useCallback(
-    (text: string) => {
-      if (text.trim()) {
-        sendMessage(
-          { text },
-          { body: { modelId: 'openai/gpt-5-mini', reasoningEffort: 'medium', orgId, taskId } },
-        );
-        setInput('');
-      }
-    },
-    [sendMessage, setInput, orgId, taskId],
-  );
-
-  const handleSecretAdded = useCallback(
-    (secretName: string) => {
-      // Send a message to the AI informing it that the secret was added
-      sendMessage(
-        {
-          text: `I've added the secret "${secretName}". You can now use it in the automation script.`,
-        },
-        { body: { modelId: 'openai/gpt-5-mini', reasoningEffort: 'medium', orgId, taskId } },
-      );
-    },
-    [sendMessage, orgId, taskId],
-  );
-
-  const handleInfoProvided = useCallback(
-    (info: Record<string, string>) => {
-      // Format the provided information for the AI
-      const infoText = Object.entries(info)
-        .map(([key, value]) => `${key}: ${value}`)
-        .join('\n');
-
-      // Send a message to the AI with the provided information
-      sendMessage(
-        {
-          text: `I've provided the following information:\n\n${infoText}\n\nYou can now continue with creating the automation script.`,
-        },
-        { body: { modelId: 'openai/gpt-5-mini', reasoningEffort: 'medium', orgId, taskId } },
-      );
-    },
-    [sendMessage, orgId, taskId],
-  );
-
-  useEffect(() => {
-    setChatStatus(status);
-  }, [status, setChatStatus]);
-
-  const hasMessages = messages.length > 0;
-
-  return (
-    <div
-      className={cn(className, 'selection:bg-primary selection:text-white relative')}
-      style={{ height: 'calc(100vh - 6em)' }}
-    >
-      <Image
-        src="/automation-bg.svg"
-        alt="Automation"
-        width={538}
-        height={561}
-        className="absolute top-0 right-0 z-10 pointer-events-none opacity-50"
-      />
-
-      <PanelHeader className="shrink-0 relative z-20">
-        <div className="flex items-center justify-between w-full">
-          <div className="flex items-center gap-4">
-            <Breadcrumb>
-              <BreadcrumbList>
-                <BreadcrumbItem>
-                  <BreadcrumbLink asChild>
-                    <Link
-                      href={`/${orgId}/tasks`}
-                      className="text-xs text-muted-foreground hover:text-foreground"
-                    >
-                      Tasks
-                    </Link>
-                  </BreadcrumbLink>
-                </BreadcrumbItem>
-                <BreadcrumbSeparator>
-                  <ChevronRight className="w-3 h-3" />
-                </BreadcrumbSeparator>
-                <BreadcrumbItem>
-                  <BreadcrumbLink asChild>
-                    <Link
-                      href={`/${orgId}/tasks/${taskId}`}
-                      className="text-xs text-muted-foreground hover:text-foreground"
-                    >
-                      {taskName || 'Task'}
-                    </Link>
-                  </BreadcrumbLink>
-                </BreadcrumbItem>
-                <BreadcrumbSeparator>
-                  <ChevronRight className="w-3 h-3" />
-                </BreadcrumbSeparator>
-                <BreadcrumbItem>
-                  <BreadcrumbLink asChild>
-                    <Link
-                      href={`/${orgId}/tasks/${taskId}/automation`}
-                      className="flex items-center text-xs text-muted-foreground hover:text-foreground"
-                    >
-                      <span className="font-medium text-xs text-foreground/90">
-                        Integration Builder
-                      </span>
-                    </Link>
-                  </BreadcrumbLink>
-                </BreadcrumbItem>
-              </BreadcrumbList>
-            </Breadcrumb>
-          </div>
-        </div>
-      </PanelHeader>
-
-      {/* Messages Area */}
-      {!hasMessages ? (
-        <form
-          className={cn('flex flex-col w-full h-full px-58 z-20', scriptUrl && 'px-8 pb-4')}
-          onSubmit={async (event) => {
-            event.preventDefault();
-            validateAndSubmitMessage(input);
-          }}
-        >
-          <div className="flex-1 min-h-0 overflow-y-auto h-full z-20">
-            <div className="w-full h-full flex flex-col items-center py-48">
-              {/* Top Section - Fixed Position */}
-              <div className="w-full max-w-3xl text-center space-y-8 mb-80">
-                <p className="text-2xl font-medium text-primary tracking-wide z-20">
-                  What evidence do you want to collect?
-                </p>
-                <Input
-                  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 hover:scale-[1.01] focus:shadow-lg focus:shadow-primary/10 focus:scale-[1.02] focus:ring-2 focus:ring-primary/30"
-                  value={input}
-                  onChange={(e) => setInput(e.target.value)}
-                  disabled={status === 'streaming' || status === 'submitted'}
-                />
-              </div>
-
-              {/* Examples Section */}
-              <div className="w-full max-w-4xl space-y-8">
-                <h3 className="text-xl font-normal text-center text-primary">
-                  Get started with examples
-                </h3>
-
-                {/* All Examples Grid */}
-                <div className="grid grid-cols-2 md:grid-cols-3 gap-3 max-w-3xl mx-auto">
-                  {AUTOMATION_EXAMPLES.map((example) => (
-                    <Card
-                      key={example.title}
-                      className="cursor-pointer transition-all duration-200 hover:scale-[1.02] hover:shadow-xl"
-                      onClick={() => handleExampleClick(example.prompt)}
-                    >
-                      <CardHeader className="p-4">
-                        <div className="flex items-start gap-3">
-                          <Image
-                            src={example.url}
-                            alt={example.title}
-                            width={24}
-                            height={24}
-                            className="rounded-sm"
-                          />
-                          <CardDescription className="flex-1">
-                            <p className="text-sm font-normal text-foreground leading-relaxed">
-                              {example.title}
-                            </p>
-                          </CardDescription>
-                        </div>
-                      </CardHeader>
-                    </Card>
-                  ))}
-                </div>
-              </div>
-            </div>
-          </div>
-        </form>
-      ) : (
-        <div className="flex flex-col h-full relative z-20">
-          <Conversation className="flex-1 min-h-0">
-            <ConversationContent className="space-y-4 chat-scrollbar">
-              {messages.map((message) => (
-                <Message
-                  key={message.id}
-                  message={message}
-                  orgId={orgId}
-                  onSecretAdded={handleSecretAdded}
-                  onInfoProvided={handleInfoProvided}
-                />
-              ))}
-            </ConversationContent>
-            <ConversationScrollButton />
-          </Conversation>
-
-          <form
-            className="flex py-6 px-4"
-            onSubmit={async (event) => {
-              event.preventDefault();
-              validateAndSubmitMessage(input);
-            }}
-          >
-            <Input
-              disabled={status === 'streaming' || status === 'submitted'}
-              onChange={(e) => setInput(e.target.value)}
-              placeholder="Ask me to create an automation..."
-              value={input}
-            />
-          </form>
-        </div>
-      )}
-    </div>
-  );
-}
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/lib/chat-context.tsx b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/lib/chat-context.tsx
deleted file mode 100644
index 72ec20f7e..000000000
--- a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/lib/chat-context.tsx
+++ /dev/null
@@ -1,51 +0,0 @@
-'use client';
-
-import { Chat } from '@ai-sdk/react';
-import { DataUIPart, DefaultChatTransport } from 'ai';
-import { createContext, useContext, useMemo, useRef, type ReactNode } from 'react';
-import { toast } from 'sonner';
-import { mutate } from 'swr';
-import { type ChatUIMessage } from '../components/chat/types';
-import { useTaskAutomationDataMapper } from './task-automation-store';
-import { DataPart } from './types/data-parts';
-
-interface ChatContextValue {
-  chat: Chat<ChatUIMessage>;
-}
-
-const ChatContext = createContext<ChatContextValue | undefined>(undefined);
-
-export function ChatProvider({ children }: { children: ReactNode }) {
-  const mapDataToState = useTaskAutomationDataMapper();
-  const mapDataToStateRef = useRef(mapDataToState);
-  mapDataToStateRef.current = mapDataToState;
-
-  const baseUrl = process.env.NEXT_PUBLIC_ENTERPRISE_API_URL;
-  const url = `${baseUrl}/api/tasks-automations/chat`;
-
-  const chat = useMemo(
-    () =>
-      new Chat<ChatUIMessage>({
-        transport: new DefaultChatTransport({
-          api: url,
-        }),
-        onToolCall: () => mutate(`/api/auth/info`),
-        onData: (data: DataUIPart<DataPart>) => mapDataToStateRef.current(data),
-        onError: (error) => {
-          toast.error(`Communication error with the AI: ${error.message}`);
-          console.error('Error sending message:', error);
-        },
-      }),
-    [],
-  );
-
-  return <ChatContext.Provider value={{ chat }}>{children}</ChatContext.Provider>;
-}
-
-export function useSharedChatContext() {
-  const context = useContext(ChatContext);
-  if (!context) {
-    throw new Error('useSharedChatContext must be used within a ChatProvider');
-  }
-  return context;
-}
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/page.tsx b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/page.tsx
deleted file mode 100644
index 4d76078eb..000000000
--- a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/page.tsx
+++ /dev/null
@@ -1,33 +0,0 @@
-import { db } from '@db';
-import { redirect } from 'next/navigation';
-import { AutomationLayoutWrapper } from './automation-layout-wrapper';
-import { AutomationPageClient } from './components/AutomationPageClient';
-
-export default async function Page({
-  params,
-}: {
-  params: Promise<{ taskId: string; orgId: string }>;
-}) {
-  const { taskId, orgId } = await params;
-
-  const task = await db.task.findUnique({
-    where: {
-      id: taskId,
-      organizationId: orgId,
-    },
-  });
-
-  if (!task) {
-    redirect('/tasks');
-  }
-
-  const taskName = task.title;
-
-  return (
-    <AutomationLayoutWrapper>
-      <div className="h-screen overflow-hidden">
-        <AutomationPageClient orgId={orgId} taskId={taskId} taskName={taskName} />
-      </div>
-    </AutomationLayoutWrapper>
-  );
-}
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/tools/exa-search.ts b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/tools/exa-search.ts
deleted file mode 100644
index 947a6d21e..000000000
--- a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/tools/exa-search.ts
+++ /dev/null
@@ -1,144 +0,0 @@
-import { openai } from '@ai-sdk/openai';
-import { generateObject, tool } from 'ai';
-import { z } from 'zod';
-
-const exaSearchSchema = z.object({
-  query: z.string().min(1).describe('The search query to find relevant web content'),
-  numResults: z.number().min(1).max(10).default(5).describe('Number of search results to return'),
-  category: z
-    .enum([
-      'general',
-      'company',
-      'research_paper',
-      'news',
-      'github',
-      'tweet',
-      'movie',
-      'song',
-      'personal_site',
-      'pdf',
-    ])
-    .default('general')
-    .describe('Category to search within'),
-  startPublishedDate: z
-    .string()
-    .optional()
-    .describe('Start date for filtering results (ISO format: YYYY-MM-DD)'),
-  endPublishedDate: z
-    .string()
-    .optional()
-    .describe('End date for filtering results (ISO format: YYYY-MM-DD)'),
-  useAutoprompt: z
-    .boolean()
-    .default(true)
-    .describe('Whether to enhance the query with additional context for better results'),
-  type: z
-    .enum(['keyword', 'neural'])
-    .default('neural')
-    .describe('Search type - neural for semantic search, keyword for exact matches'),
-});
-
-export const exaSearchTool = () =>
-  tool({
-    description:
-      'Search the web using Exa AI for relevant, high-quality content. Exa uses neural search to find semantically similar content beyond just keyword matching. Use this to find documentation, articles, research papers, and other web content.',
-    inputSchema: exaSearchSchema,
-    execute: async (args: unknown) => {
-      const parsedArgs = exaSearchSchema.parse(args);
-
-      const EXA_API_KEY = process.env.EXA_API_KEY;
-      if (!EXA_API_KEY) {
-        throw new Error('EXA_API_KEY environment variable is not set');
-      }
-
-      try {
-        const searchParams: any = {
-          query: parsedArgs.query,
-          num_results: parsedArgs.numResults,
-          category: parsedArgs.category,
-          use_autoprompt: parsedArgs.useAutoprompt,
-          type: parsedArgs.type,
-        };
-
-        // Add optional date filters
-        if (parsedArgs.startPublishedDate) {
-          searchParams.start_published_date = parsedArgs.startPublishedDate;
-        }
-        if (parsedArgs.endPublishedDate) {
-          searchParams.end_published_date = parsedArgs.endPublishedDate;
-        }
-
-        const response = await fetch('https://api.exa.ai/search', {
-          method: 'POST',
-          headers: {
-            'Content-Type': 'application/json',
-            'x-api-key': EXA_API_KEY,
-          },
-          body: JSON.stringify(searchParams),
-        });
-
-        if (!response.ok) {
-          const error = await response.text();
-          throw new Error(`Exa search failed: ${response.status} - ${error}`);
-        }
-
-        const data = await response.json();
-
-        // Format the results for the AI to use
-        const formattedResults = data.results.map((result: any) => ({
-          title: result.title,
-          url: result.url,
-          snippet: result.text || result.snippet || '',
-          publishedDate: result.published_date,
-          author: result.author,
-          score: result.score,
-        }));
-
-        // Generate a structured summary of what was found
-        let summary = '';
-        try {
-          const summaryResponse = await generateObject({
-            model: openai('gpt-4o-mini'),
-            schema: z.object({
-              action: z.string().describe('What action was performed, e.g. "Searched for"'),
-              target: z.string().describe('What was searched for or targeted'),
-              result: z.string().describe('Brief description of what was found'),
-            }),
-            messages: [
-              {
-                role: 'system',
-                content:
-                  'You are a helpful assistant that summarizes search results in a structured way for non-technical users.',
-              },
-              {
-                role: 'user',
-                content: `Summarize this search:\n\nQuery: "${parsedArgs.query}"\nFound ${data.results.length} results.\n\nTop results:\n${formattedResults
-                  .slice(0, 3)
-                  .map((r: any) => `- ${r.title}`)
-                  .join('\n')}`,
-              },
-            ],
-            maxRetries: 1,
-          });
-
-          // Format as a readable string
-          summary = `${summaryResponse.object.action} "${summaryResponse.object.target}" - ${summaryResponse.object.result}`;
-        } catch (err) {
-          // If summary generation fails, just continue without it
-          console.error('Failed to generate summary:', err);
-        }
-
-        return {
-          query: parsedArgs.query,
-          totalResults: data.results.length,
-          results: formattedResults,
-          summary,
-        };
-      } catch (error) {
-        console.error('Exa search error:', error);
-        throw new Error(
-          `Failed to search with Exa: ${error instanceof Error ? error.message : 'Unknown error'}`,
-        );
-      }
-    },
-  });
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/tools/firecrawl.ts b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/tools/firecrawl.ts
deleted file mode 100644
index bad53ed2f..000000000
--- a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/tools/firecrawl.ts
+++ /dev/null
@@ -1,169 +0,0 @@
-import { openai } from '@ai-sdk/openai';
-import { generateObject, tool } from 'ai';
-import { z } from 'zod';
-
-const firecrawlSchema = z.object({
-  url: z.string().url().describe('The URL of the website to crawl and extract content from'),
-  formats: z
-    .array(z.enum(['markdown', 'html', 'rawHtml', 'links', 'screenshot']))
-    .default(['markdown'])
-    .describe('Formats to return - markdown is usually best for AI processing'),
-  onlyMainContent: z
-    .boolean()
-    .default(true)
-    .describe('Whether to extract only the main content, removing navigation, footers, etc.'),
-  includeTags: z
-    .array(z.string())
-    .optional()
-    .describe('HTML tags to include in the extraction (e.g., ["article", "main", "div.content"])'),
-  excludeTags: z
-    .array(z.string())
-    .optional()
-    .describe('HTML tags to exclude from extraction (e.g., ["nav", "footer", "aside"])'),
-  waitFor: z
-    .number()
-    .min(0)
-    .max(10000)
-    .optional()
-    .describe('Time to wait in ms for JavaScript to load (for dynamic sites)'),
-  timeout: z
-    .number()
-    .min(1000)
-    .max(30000)
-    .default(15000)
-    .describe('Maximum time in ms to wait for the page to load'),
-});
-
-export const firecrawlTool = () =>
-  tool({
-    description:
-      'Crawl and extract content from any website using Firecrawl v2 API. This tool can extract clean markdown, HTML, or raw content from web pages, handle JavaScript-rendered sites, and take screenshots. Use this after finding relevant URLs with Exa search to get the full content. Supports modern web apps with dynamic content.',
-    inputSchema: firecrawlSchema,
-    execute: async (args: unknown) => {
-      const parsedArgs = firecrawlSchema.parse(args);
-
-      const FIRECRAWL_API_KEY = process.env.FIRECRAWL_API_KEY;
-      if (!FIRECRAWL_API_KEY) {
-        throw new Error('FIRECRAWL_API_KEY environment variable is not set');
-      }
-
-      try {
-        const scrapeParams: any = {
-          url: parsedArgs.url,
-          formats: parsedArgs.formats,
-          onlyMainContent: parsedArgs.onlyMainContent,
-          timeout: parsedArgs.timeout,
-        };
-
-        // Add optional parameters
-        if (parsedArgs.includeTags && parsedArgs.includeTags.length > 0) {
-          scrapeParams.includeTags = parsedArgs.includeTags;
-        }
-        if (parsedArgs.excludeTags && parsedArgs.excludeTags.length > 0) {
-          scrapeParams.excludeTags = parsedArgs.excludeTags;
-        }
-        if (parsedArgs.waitFor !== undefined) {
-          scrapeParams.waitFor = parsedArgs.waitFor;
-        }
-
-        const response = await fetch('https://api.firecrawl.dev/v2/scrape', {
-          method: 'POST',
-          headers: {
-            'Content-Type': 'application/json',
-            Authorization: `Bearer ${FIRECRAWL_API_KEY}`,
-          },
-          body: JSON.stringify(scrapeParams),
-        });
-
-        if (!response.ok) {
-          const error = await response.text();
-          throw new Error(`Firecrawl scrape failed: ${response.status} - ${error}`);
-        }
-
-        const data = await response.json();
-
-        if (!data.success) {
-          throw new Error(`Firecrawl scrape failed: ${data.error || 'Unknown error'}`);
-        }
-
-        // Return the scraped content in a structured format
-        const result: any = {
-          url: parsedArgs.url,
-          title: data.data?.metadata?.title || '',
-          description: data.data?.metadata?.description || '',
-        };
-
-        // Add the requested formats (v2 API structure)
-        if (parsedArgs.formats.includes('markdown') && data.data?.markdown) {
-          result.markdown = data.data.markdown;
-        }
-        if (parsedArgs.formats.includes('html') && data.data?.html) {
-          result.html = data.data.html;
-        }
-        if (parsedArgs.formats.includes('rawHtml') && data.data?.rawHtml) {
-          result.rawHtml = data.data.rawHtml;
-        }
-        if (parsedArgs.formats.includes('links') && data.data?.links) {
-          result.links = data.data.links;
-        }
-        if (parsedArgs.formats.includes('screenshot') && data.data?.screenshot) {
-          result.screenshot = data.data.screenshot;
-        }
-
-        // Add metadata
-        result.metadata = {
-          sourceURL: data.data?.metadata?.sourceURL || parsedArgs.url,
-          pageStatusCode: data.data?.metadata?.pageStatusCode,
-          pageError: data.data?.metadata?.pageError,
-          ogTitle: data.data?.metadata?.ogTitle,
-          ogDescription: data.data?.metadata?.ogDescription,
-          ogImage: data.data?.metadata?.ogImage,
-        };
-
-        // Generate a structured summary of what was extracted
-        let summary = '';
-        try {
-          const pageInfo = [];
-          if (result.title) pageInfo.push(`Title: "${result.title}"`);
-          if (result.description) pageInfo.push(`Description: "${result.description}"`);
-          if (result.markdown)
-            pageInfo.push(`Extracted ${result.markdown.length} characters of content`);
-
-          const summaryResponse = await generateObject({
-            model: openai('gpt-4o-mini'),
-            schema: z.object({
-              action: z.string().describe('What action was performed, e.g. "Visited"'),
-              target: z.string().describe('What was visited or targeted'),
-              result: z.string().describe('Brief description of what was extracted'),
-            }),
-            messages: [
-              {
-                role: 'system',
-                content:
-                  'You are a helpful assistant that summarizes web scraping results in a structured way for non-technical users.',
-              },
-              {
-                role: 'user',
-                content: `Summarize what was extracted from this webpage:\n\nURL: ${parsedArgs.url}\n${pageInfo.join('\n')}`,
-              },
-            ],
-            maxRetries: 1,
-          });
-
-          // Format as a readable string
-          summary = `${summaryResponse.object.action} ${summaryResponse.object.target} - ${summaryResponse.object.result}`;
-        } catch (err) {
-          // If summary generation fails, just continue without it
-          console.error('Failed to generate summary:', err);
-        }
-
-        result.summary = summary;
-        return result;
-      } catch (error) {
-        console.error('Firecrawl error:', error);
-        throw new Error(
-          `Failed to crawl with Firecrawl: ${error instanceof Error ? error.message : 'Unknown error'}`,
-        );
-      }
-    },
-  });
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/tools/generate-files/deferred.ts b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/tools/generate-files/deferred.ts
deleted file mode 100644
index f6bcec13b..000000000
--- a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/tools/generate-files/deferred.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-export class Deferred<T> {
-  private resolveFn: (value: T | PromiseLike<T>) => void = () => {}
-  private rejectFn: (reason?: any) => void = () => {}
-  private _promise: Promise<T>
-
-  constructor() {
-    this._promise = new Promise<T>((resolve, reject) => {
-      this.resolveFn = resolve
-      this.rejectFn = reject
-    })
-  }
-
-  get promise() {
-    return this._promise
-  }
-
-  resolve(value: T | PromiseLike<T>): void {
-    this.resolveFn(value)
-  }
-
-  reject(reason?: any): void {
-    this.rejectFn(reason)
-  }
-}
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/tools/generate-files/get-contents.ts b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/tools/generate-files/get-contents.ts
deleted file mode 100644
index d04f1d034..000000000
--- a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/tools/generate-files/get-contents.ts
+++ /dev/null
@@ -1,93 +0,0 @@
-import { streamObject, type ModelMessage } from 'ai';
-import z from 'zod/v3';
-import { getModelOptions } from '../../tools/gateway';
-import { Deferred } from './deferred';
-
-export type File = z.infer<typeof fileSchema>;
-
-const fileSchema = z.object({
-  path: z
-    .string()
-    .describe(
-      "Path to the file in the Vercel Sandbox (relative paths from sandbox root, e.g., 'src/main.js', 'package.json', 'components/Button.tsx')",
-    ),
-  content: z
-    .string()
-    .describe(
-      'The content of the file as a utf8 string (complete file contents that will replace any existing file at this path)',
-    ),
-});
-
-interface Params {
-  messages: ModelMessage[];
-  modelId: string;
-  paths: string[];
-}
-
-interface FileContentChunk {
-  files: z.infer<typeof fileSchema>[];
-  paths: string[];
-  written: string[];
-}
-
-export async function* getContents(params: Params): AsyncGenerator<FileContentChunk> {
-  const generated: z.infer<typeof fileSchema>[] = [];
-  const deferred = new Deferred<void>();
-  const result = streamObject({
-    ...getModelOptions(params.modelId, { reasoningEffort: 'minimal' }),
-    system:
-      "You are a file content generator. You must generate files based on the conversation history and the provided paths. NEVER generate lock files (pnpm-lock.yaml, package-lock.json, yarn.lock) - these are automatically created by package managers.\n\nSTRICT LAMBDA RULES:\nFor any file whose path matches /^lambdas\\\/.*\\.js$/, you MUST adhere to ALL of the following or REGENERATE until compliant:\n1) The first non-whitespace characters in the file MUST be: module.exports = async (event) => {\n2) There MUST be NO code, comments, imports, or variables outside the exported function (neither before nor after)\n3) All require(...) and helper functions MUST be inside the exported function\n4) Do NOT use process.env for secrets. Use getSecret inside the function.\n5) Output raw file contents only (no markdown fences).\n6) Networking: ONLY use global fetch. NEVER use https/http/node:https/node:http/axios/node-fetch.\n\nDISALLOWED EXAMPLE (never produce):\n// comment\nconst https = require('https');\nmodule.exports = async (event) => { /* ... */ };\n\nALLOWED SHAPE (example):\nmodule.exports = async (event) => {\n  const u = new URL('https://api.example.com/resource');\n  const res = await fetch(u);\n  const data = await res.json();\n  return { ok: true, data };\n};",
-    messages: [
-      ...params.messages,
-      {
-        role: 'user',
-        content: `Generate the content of the following files according to the conversation: ${params.paths.map(
-          (path) => `\n - ${path}`,
-        )}`,
-      },
-    ],
-    schema: z.object({ files: z.array(fileSchema) }),
-    onError: (error) => {
-      deferred.reject(error);
-      console.error('Error communicating with AI');
-      console.error(JSON.stringify(error, null, 2));
-    },
-  });
-
-  for await (const items of result.partialObjectStream) {
-    if (!Array.isArray(items?.files)) {
-      continue;
-    }
-
-    const written = generated.map((file) => file.path);
-    const paths = written.concat(
-      items.files
-        .slice(generated.length, items.files.length - 1)
-        .flatMap((f) => (f?.path ? [f.path] : [])),
-    );
-
-    const files = items.files
-      .slice(generated.length, items.files.length - 2)
-      .map((file) => fileSchema.parse(file));
-
-    if (files.length > 0) {
-      yield { files, paths, written };
-      generated.push(...files);
-    } else {
-      yield { files: [], written, paths };
-    }
-  }
-
-  const raceResult = await Promise.race([result.object, deferred.promise]);
-  if (!raceResult) {
-    throw new Error('Unexpected Error: Deferred was resolved before the result');
-  }
-
-  const written = generated.map((file) => file.path);
-  const files = raceResult.files.slice(generated.length);
-  const paths = written.concat(files.map((file) => file.path));
-  if (files.length > 0) {
-    yield { files, written, paths };
-    generated.push(...files);
-  }
-}
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/tools/prompt-for-info.ts b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/tools/prompt-for-info.ts
deleted file mode 100644
index 48b521185..000000000
--- a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/tools/prompt-for-info.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-import { tool } from 'ai';
-import { z } from 'zod';
-
-export function promptForInfoTool() {
-  return tool({
-    name: 'promptForInfo',
-    description: 'Prompt the user to provide missing information needed for the automation',
-    inputSchema: z.object({
-      fields: z
-        .array(
-          z.object({
-            name: z.string().describe('The field name (e.g., "github_org", "repo_name")'),
-            label: z.string().describe('Human-readable label for the field'),
-            description: z
-              .string()
-              .optional()
-              .describe('Help text explaining what this field is for'),
-            placeholder: z.string().optional().describe('Placeholder text for the input'),
-            defaultValue: z.string().optional().describe('Default value if any'),
-            required: z.boolean().default(true).describe('Whether this field is required'),
-          }),
-        )
-        .describe('List of fields to prompt the user for'),
-      reason: z.string().describe('Explanation of why this information is needed'),
-    }),
-    execute: async ({ fields, reason }) => {
-      // Format the response in a way the frontend can parse
-      const formattedFields = fields
-        .map(
-          (field) =>
-            `Field: ${field.name}|${field.label}|${field.description || ''}|${field.placeholder || ''}|${field.defaultValue || ''}|${field.required}`,
-        )
-        .join('\n');
-
-      return `[INFO_REQUIRED]
-Reason: ${reason}
-${formattedFields}
-[/INFO_REQUIRED]
-
-I need some additional information to create this automation. ${reason}
-
-Please provide the required information above, then let me know when you've added it so I can continue.`;
-    },
-  });
-}
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/tools/prompt-for-secret.ts b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/tools/prompt-for-secret.ts
deleted file mode 100644
index 740dffb7a..000000000
--- a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/tools/prompt-for-secret.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-import { tool } from 'ai';
-import { z } from 'zod';
-
-const promptForSecretSchema = z.object({
-  secretName: z
-    .string()
-    .min(1)
-    .max(100)
-    .regex(/^[A-Z0-9_]+$/, 'Name must be uppercase letters, numbers, and underscores only'),
-  description: z.string().optional(),
-  category: z.string().optional(),
-  exampleValue: z.string().optional(),
-  reason: z.string().describe('Explain why this secret is needed for the automation'),
-});
-
-export const promptForSecretTool = () =>
-  tool({
-    description:
-      'Prompt the user to add a secret that is required for the automation but not currently configured',
-    inputSchema: promptForSecretSchema,
-    execute: async (args: unknown) => {
-      const { secretName, description, category, exampleValue, reason } =
-        promptForSecretSchema.parse(args);
-
-      // Return a special response that the frontend will recognize
-      // The message will be shown to the user and parsed by the chat component
-      return `[SECRET_REQUIRED]
-Secret Name: ${secretName}
-Description: ${description || 'No description provided'}
-Category: ${category || 'automation'}
-Example: ${exampleValue || 'No example provided'}
-Reason: ${reason}
-[/SECRET_REQUIRED]
-
-I need the secret "${secretName}" to create this automation. ${reason}
-
-Please click the button above to add this secret, then let me know when you've added it so I can continue.`;
-    },
-  });
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/tools/store-to-s3.ts b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/tools/store-to-s3.ts
deleted file mode 100644
index f2fbd791f..000000000
--- a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/tools/store-to-s3.ts
+++ /dev/null
@@ -1,134 +0,0 @@
-import { s3Client } from '@/app/s3';
-import { PutObjectCommand } from '@aws-sdk/client-s3';
-import type { UIMessage, UIMessageStreamWriter } from 'ai';
-import { tool } from 'ai';
-import z from 'zod/v3';
-import type { DataPart } from '../lib/types/data-parts';
-
-interface Params {
-  writer: UIMessageStreamWriter<UIMessage<never, DataPart>>;
-}
-
-const inputSchema = z.object({
-  content: z.string().min(1).describe('The full file content to store'),
-  orgId: z.string().optional().describe('Organization identifier'),
-  taskId: z.string().optional().describe('Task identifier'),
-  contentType: z.string().optional().describe('MIME type, defaults to text/plain for generic code'),
-});
-interface ToolInput {
-  content: string;
-  orgId?: string;
-  taskId?: string;
-  contentType?: string;
-}
-
-export const storeToS3 = ({ writer }: Params) => {
-  const config = {
-    description:
-      'Upload a generated code artifact to S3 for persistence. Use after user confirms the code is good.',
-    inputSchema,
-    execute: async (args: unknown, ctx: { toolCallId: string }) => {
-      const { toolCallId } = ctx;
-      const parsed: unknown = inputSchema.parse(args);
-      const input = parsed as ToolInput;
-      const { content, orgId, taskId, contentType } = input;
-
-      // Validate task format: must export a function via module.exports
-      // Validate task format: must export a function with only event parameter
-      // (getSecret and fetch are provided as globals in the Lambda sandbox)
-      const isTaskFn =
-        /module\.exports\s*=\s*async\s*\(\s*event\s*\)\s*=>\s*\{/.test(content) ||
-        /module\.exports\s*=\s*\(\s*event\s*\)\s*=>\s*\{/.test(content) ||
-        /module\.exports\s*=\s*async\s*function\s*\(\s*event\s*\)\s*\{/.test(content) ||
-        /module\.exports\s*=\s*function\s*\(\s*event\s*\)\s*\{/.test(content);
-
-      if (!isTaskFn) {
-        const message =
-          'Task module must export a function via module.exports = async (event) => { ... }';
-        writer.write({
-          id: toolCallId,
-          type: 'data-store-to-s3',
-          data: {
-            status: 'error',
-            error: { message },
-          },
-        });
-        return message;
-      }
-      // Enforce: no usage of process.env in task code
-      if (/process\.env\b/.test(content)) {
-        const message =
-          'Do not use process.env in task code; use the global getSecret function provided by the Lambda sandbox.';
-        writer.write({
-          id: toolCallId,
-          type: 'data-store-to-s3',
-          data: {
-            status: 'error',
-            error: { message },
-          },
-        });
-        return message;
-      }
-      const resolvedBucket = process.env.TASKS_AUTOMATION_BUCKET;
-      const resolvedOrgId = orgId;
-      const resolvedTaskId = taskId;
-      const keyBase = `${resolvedOrgId}/${resolvedTaskId}`;
-      const key = `${keyBase}.automation.js`;
-
-      writer.write({
-        id: toolCallId,
-        type: 'data-store-to-s3',
-        data: {
-          status: 'uploading',
-          bucket: resolvedBucket,
-          key,
-        },
-      });
-
-      try {
-        await s3Client.send(
-          new PutObjectCommand({
-            Bucket: resolvedBucket,
-            Key: key,
-            Body: Buffer.from(content, 'utf8'),
-            ContentType: contentType || 'application/javascript; charset=utf-8',
-            Metadata: {
-              runtime: 'nodejs20.x',
-              handler: 'task-fn',
-              language: 'javascript',
-              entry: 'task.js',
-              packaging: 'task-fn',
-              filename: key,
-            },
-          }),
-        );
-
-        writer.write({
-          id: toolCallId,
-          type: 'data-store-to-s3',
-          data: {
-            status: 'done',
-            bucket: resolvedBucket,
-            key,
-          },
-        });
-
-        return `Stored code in s3://${resolvedBucket}/${key}`;
-      } catch (error) {
-        const message = (error as Error)?.message || 'Unknown error uploading to S3';
-        writer.write({
-          id: toolCallId,
-          type: 'data-store-to-s3',
-          data: {
-            status: 'error',
-            bucket: resolvedBucket,
-            key,
-            error: { message },
-          },
-        });
-        return message;
-      }
-    },
-  } as const;
-  return tool(config as any);
-};
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
new file mode 100644
index 000000000..733fa9ce3
--- /dev/null
+++ b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automations/[automationId]/overview/components/AutomationOverview.tsx
@@ -0,0 +1,187 @@
+'use client';
+
+import {
+  Breadcrumb,
+  BreadcrumbItem,
+  BreadcrumbLink,
+  BreadcrumbList,
+  BreadcrumbSeparator,
+} from '@comp/ui/breadcrumb';
+import { Button } from '@comp/ui/button';
+import { Card, CardContent, CardHeader, CardTitle } from '@comp/ui/card';
+import { EvidenceAutomation, EvidenceAutomationRun, EvidenceAutomationVersion, Task } from '@db';
+import { ChevronRight, Edit, 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 { AutomationRunsCard } from '../../../../components/AutomationRunsCard';
+import { MetricsSection } from './MetricsSection';
+
+type RunWithAutomationName = EvidenceAutomationRun & {
+  evidenceAutomation: {
+    name: string;
+  };
+};
+
+interface AutomationOverviewProps {
+  task: Task;
+  automation: EvidenceAutomation;
+  initialRuns: RunWithAutomationName[];
+  initialVersions: EvidenceAutomationVersion[];
+}
+
+export function AutomationOverview({
+  task,
+  automation,
+  initialRuns,
+  initialVersions,
+}: AutomationOverviewProps) {
+  const { orgId, taskId, automationId } = useParams<{
+    orgId: string;
+    taskId: string;
+    automationId: string;
+  }>();
+
+  const [editNameOpen, setEditNameOpen] = useState(false);
+  const [editDescriptionOpen, setEditDescriptionOpen] = useState(false);
+  const [deleteDialogOpen, setDeleteDialogOpen] = useState(false);
+
+  // Transform runs to include automation name
+  const runsWithName = useMemo(
+    () =>
+      initialRuns.map((run) => ({
+        ...run,
+        evidenceAutomation: {
+          name: automation.name,
+        },
+      })),
+    [initialRuns, automation.name],
+  );
+
+  return (
+    <div>
+      {/* Breadcrumb */}
+      <div className="px-8 py-4">
+        <Breadcrumb>
+          <BreadcrumbList>
+            <BreadcrumbItem>
+              <BreadcrumbLink asChild>
+                <Link
+                  href={`/${orgId}/tasks`}
+                  className="text-muted-foreground hover:text-foreground"
+                >
+                  Tasks
+                </Link>
+              </BreadcrumbLink>
+            </BreadcrumbItem>
+            <BreadcrumbSeparator>
+              <ChevronRight className="h-4 w-4" />
+            </BreadcrumbSeparator>
+            <BreadcrumbItem>
+              <BreadcrumbLink asChild>
+                <Link
+                  href={`/${orgId}/tasks/${taskId}`}
+                  className="text-muted-foreground hover:text-foreground"
+                >
+                  {task.title}
+                </Link>
+              </BreadcrumbLink>
+            </BreadcrumbItem>
+            <BreadcrumbSeparator>
+              <ChevronRight className="h-4 w-4" />
+            </BreadcrumbSeparator>
+            <BreadcrumbItem>
+              <BreadcrumbLink asChild>
+                <span className="text-foreground font-medium">{automation.name}</span>
+              </BreadcrumbLink>
+            </BreadcrumbItem>
+          </BreadcrumbList>
+        </Breadcrumb>
+      </div>
+
+      <MetricsSection
+        automationName={automation.name}
+        initialVersions={initialVersions}
+        initialRuns={initialRuns}
+      />
+
+      {/* Main Content - 2 Column Layout */}
+      <div className="grid grid-cols-1 lg:grid-cols-3 gap-6 px-8 py-12">
+        {/* Left Column - History */}
+        <div className="lg:col-span-2">
+          <AutomationRunsCard runs={runsWithName} />
+        </div>
+
+        {/* Right Column - Details & Versions */}
+        <div className="space-y-6">
+          <Card>
+            <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
+                    </Button>
+                  </Link>
+                  <Button variant="outline" size="sm" onClick={() => setDeleteDialogOpen(true)}>
+                    <Trash2 className="h-4 w-4" />
+                  </Button>
+                </div>
+              </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">Created</p>
+                  <p className="text-sm">
+                    {new Date(automation.createdAt).toLocaleDateString('en-US', {
+                      month: 'short',
+                      day: 'numeric',
+                      year: 'numeric',
+                    })}{' '}
+                    at{' '}
+                    {new Date(automation.createdAt).toLocaleTimeString('en-US', {
+                      hour: 'numeric',
+                      minute: '2-digit',
+                      hour12: true,
+                    })}
+                  </p>
+                </div>
+                <div className="flex flex-col gap-1">
+                  <p className="text-xs font-medium text-muted-foreground">Last Published</p>
+                  <p className="text-sm">
+                    {new Date(runsWithName[0].createdAt).toLocaleDateString('en-US', {
+                      month: 'short',
+                      day: 'numeric',
+                      year: 'numeric',
+                    })}{' '}
+                    at{' '}
+                    {new Date(runsWithName[0].createdAt).toLocaleTimeString('en-US', {
+                      hour: 'numeric',
+                      minute: '2-digit',
+                      hour12: true,
+                    })}
+                  </p>
+                </div>
+              </div>
+            </CardContent>
+          </Card>
+
+          {/* <VersionsCard /> */}
+        </div>
+      </div>
+
+      {/* Settings Dialogs */}
+      <EditNameDialog open={editNameOpen} onOpenChange={setEditNameOpen} />
+      <EditDescriptionDialog open={editDescriptionOpen} onOpenChange={setEditDescriptionOpen} />
+      <DeleteAutomationDialog open={deleteDialogOpen} onOpenChange={setDeleteDialogOpen} />
+    </div>
+  );
+}
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
new file mode 100644
index 000000000..712b50fc8
--- /dev/null
+++ b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automations/[automationId]/overview/components/MetricsSection.tsx
@@ -0,0 +1,145 @@
+'use client';
+
+import { Card, CardContent } from '@comp/ui/card';
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@comp/ui/select';
+import { EvidenceAutomationRun, EvidenceAutomationVersion } from '@db';
+import { Clock } from 'lucide-react';
+import { useMemo, useState } from 'react';
+import { useAutomationVersions } from '../../../../automation/[automationId]/hooks/use-automation-versions';
+
+interface MetricsSectionProps {
+  automationName: string;
+  initialVersions: EvidenceAutomationVersion[];
+  initialRuns: EvidenceAutomationRun[];
+}
+
+export function MetricsSection({
+  automationName,
+  initialVersions,
+  initialRuns,
+}: 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',
+  );
+
+  // Filter runs by selected version
+  const filteredRuns = useMemo(() => {
+    if (selectedVersion === 'draft') {
+      return initialRuns.filter((run) => run.version === null);
+    }
+    return initialRuns.filter((run) => run.version === parseInt(selectedVersion));
+  }, [selectedVersion, initialRuns]);
+
+  // Calculate metrics from filtered runs
+  const totalRuns = filteredRuns.length;
+  const successfulRuns = filteredRuns.filter((run) => run.status === 'completed').length;
+  const successRate = totalRuns > 0 ? Math.round((successfulRuns / totalRuns) * 100) : 0;
+  const latestRun = filteredRuns[0];
+
+  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>
+      </div>
+
+      <div className="grid grid-cols-1 md:grid-cols-4 gap-4">
+        <Card>
+          <CardContent className="p-6 min-h-[120px]">
+            <p className="text-sm text-muted-foreground mb-2">Success Rate</p>
+            <div className="flex items-baseline gap-2">
+              <p className="text-3xl font-semibold text-chart-positive">{successRate}%</p>
+              <p className="text-sm text-muted-foreground">Avg.</p>
+            </div>
+          </CardContent>
+        </Card>
+
+        <Card>
+          <CardContent className="p-6 min-h-[120px]">
+            <p className="text-sm text-muted-foreground mb-2">Schedule</p>
+            <div className="text-base font-medium flex items-center gap-2">
+              <Clock className="h-4 w-4" />
+              Every Day 9:00 AM
+            </div>
+          </CardContent>
+        </Card>
+
+        <Card>
+          <CardContent className="p-6 min-h-[120px]">
+            <p className="text-sm text-muted-foreground mb-2">Next Run</p>
+            <p className="text-base font-medium">Tomorrow 9:00 AM</p>
+          </CardContent>
+        </Card>
+
+        <Card>
+          <CardContent className="p-6 min-h-[120px]">
+            <p className="text-sm text-muted-foreground mb-2">Last Run</p>
+            {latestRun ? (
+              <>
+                <p className="text-base font-medium">
+                  {new Date(latestRun.createdAt).toLocaleTimeString([], {
+                    hour: 'numeric',
+                    minute: '2-digit',
+                  })}
+                </p>
+                <div className="flex items-center gap-2 mt-1">
+                  <span
+                    className={`text-xs font-medium ${
+                      latestRun.status === 'completed'
+                        ? 'text-chart-positive'
+                        : 'text-chart-destructive'
+                    }`}
+                  >
+                    {latestRun.status === 'completed' ? 'Complete' : 'Failed'}
+                  </span>
+                  <span className="text-xs text-muted-foreground">• 2s</span>
+                </div>
+              </>
+            ) : (
+              <p className="text-base text-muted-foreground">No runs yet</p>
+            )}
+          </CardContent>
+        </Card>
+      </div>
+    </div>
+  );
+}
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automations/[automationId]/overview/components/VersionsCard.tsx b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automations/[automationId]/overview/components/VersionsCard.tsx
new file mode 100644
index 000000000..bb356f9a9
--- /dev/null
+++ b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automations/[automationId]/overview/components/VersionsCard.tsx
@@ -0,0 +1,155 @@
+'use client';
+
+import { Button } from '@comp/ui/button';
+import { Card, CardContent, CardHeader, CardTitle } from '@comp/ui/card';
+import {
+  Dialog,
+  DialogContent,
+  DialogDescription,
+  DialogFooter,
+  DialogHeader,
+  DialogTitle,
+} from '@comp/ui/dialog';
+import { EvidenceAutomationVersion } from '@db';
+import { formatDistanceToNow } from 'date-fns';
+import { History, RotateCcw } from 'lucide-react';
+import { useParams } from 'next/navigation';
+import { useState } from 'react';
+import { toast } from 'sonner';
+import { restoreVersion } from '../../../../automation/[automationId]/actions/task-automation-actions';
+import { useAutomationVersions } from '../../../../automation/[automationId]/hooks/use-automation-versions';
+
+export function VersionsCard() {
+  const { orgId, taskId, automationId } = useParams<{
+    orgId: string;
+    taskId: string;
+    automationId: string;
+  }>();
+  const { versions, isLoading, mutate } = useAutomationVersions();
+  const [restoring, setRestoring] = useState<number | null>(null);
+  const [confirmRestore, setConfirmRestore] = useState<EvidenceAutomationVersion | null>(null);
+
+  const handleRestore = async (version: EvidenceAutomationVersion) => {
+    setRestoring(version.version);
+
+    try {
+      const result = await restoreVersion(orgId, taskId, automationId, version.version);
+
+      if (!result.success) {
+        throw new Error(result.error || 'Failed to restore version');
+      }
+
+      toast.success(`Draft overwritten with version ${version.version}`);
+      setConfirmRestore(null);
+    } catch (error) {
+      toast.error(error instanceof Error ? error.message : 'Failed to restore version');
+    } finally {
+      setRestoring(null);
+    }
+  };
+
+  if (isLoading) {
+    return (
+      <Card>
+        <CardHeader>
+          <CardTitle className="text-base font-medium flex items-center gap-2">
+            <History className="h-4 w-4 text-primary" />
+            Published Versions
+          </CardTitle>
+        </CardHeader>
+        <CardContent>
+          <p className="text-sm text-muted-foreground">Loading versions...</p>
+        </CardContent>
+      </Card>
+    );
+  }
+
+  if (!versions || versions.length === 0) {
+    return (
+      <Card>
+        <CardHeader>
+          <CardTitle className="text-base font-medium flex items-center gap-2">
+            <History className="h-4 w-4 text-primary" />
+            Published Versions
+          </CardTitle>
+        </CardHeader>
+        <CardContent>
+          <p className="text-sm text-muted-foreground text-center py-4">
+            No published versions yet
+          </p>
+        </CardContent>
+      </Card>
+    );
+  }
+
+  return (
+    <>
+      <Card>
+        <CardHeader>
+          <CardTitle className="text-base font-medium flex items-center gap-2">
+            <History className="h-4 w-4 text-primary" />
+            Published Versions
+          </CardTitle>
+        </CardHeader>
+        <CardContent className="space-y-2">
+          {versions.map((version) => {
+            const timeAgo = formatDistanceToNow(new Date(version.createdAt), { addSuffix: true });
+            const isRestoring = restoring === version.version;
+
+            return (
+              <div
+                key={version.id}
+                className="flex items-start gap-3 p-3 rounded-xs border border-border bg-muted/20 hover:bg-muted/30 transition-all"
+              >
+                <div className="flex-1 min-w-0 space-y-1">
+                  <div className="flex items-center gap-2">
+                    <span className="text-sm font-medium">Version {version.version}</span>
+                    <span className="text-xs text-muted-foreground">•</span>
+                    <span className="text-xs text-muted-foreground">{timeAgo}</span>
+                  </div>
+                  {version.changelog && (
+                    <p className="text-xs text-muted-foreground">{version.changelog}</p>
+                  )}
+                </div>
+                <Button
+                  variant="outline"
+                  size="sm"
+                  onClick={() => setConfirmRestore(version)}
+                  disabled={isRestoring}
+                >
+                  <RotateCcw className="h-4 w-4" />
+                  {isRestoring ? 'Restoring...' : 'Restore'}
+                </Button>
+              </div>
+            );
+          })}
+        </CardContent>
+      </Card>
+
+      {/* Confirm Restore Dialog */}
+      <Dialog open={!!confirmRestore} onOpenChange={(open) => !open && setConfirmRestore(null)}>
+        <DialogContent>
+          <DialogHeader>
+            <DialogTitle>Overwrite Draft with Version {confirmRestore?.version}?</DialogTitle>
+            <DialogDescription>
+              This will replace your current draft with the script from version{' '}
+              {confirmRestore?.version}. Your current draft will be lost. Chat history will be
+              preserved.
+            </DialogDescription>
+          </DialogHeader>
+          <DialogFooter>
+            <Button variant="outline" onClick={() => setConfirmRestore(null)}>
+              Cancel
+            </Button>
+            <Button
+              onClick={() => confirmRestore && handleRestore(confirmRestore)}
+              variant="destructive"
+            >
+              Overwrite Draft
+            </Button>
+          </DialogFooter>
+        </DialogContent>
+      </Dialog>
+    </>
+  );
+}
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automations/[automationId]/overview/page.tsx b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automations/[automationId]/overview/page.tsx
new file mode 100644
index 000000000..22eb87a11
--- /dev/null
+++ b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automations/[automationId]/overview/page.tsx
@@ -0,0 +1,97 @@
+import { db } from '@db';
+import { redirect } from 'next/navigation';
+import { AutomationOverview } from './components/AutomationOverview';
+
+export default async function AutomationOverviewPage({
+  params,
+}: {
+  params: Promise<{ taskId: string; orgId: string; automationId: string }>;
+}) {
+  const { taskId, orgId, automationId } = await params;
+
+  const task = await getTask(taskId);
+  if (!task) {
+    redirect(`/${orgId}/tasks`);
+  }
+
+  const automation = await getAutomation(automationId);
+  if (!automation) {
+    redirect(`/${orgId}/tasks/${taskId}`);
+  }
+
+  const runs = await getAutomationRuns(automationId);
+  const versions = await getAutomationVersions(automationId);
+
+  return (
+    <AutomationOverview
+      task={task}
+      automation={automation}
+      initialRuns={runs}
+      initialVersions={versions}
+    />
+  );
+}
+
+const getTask = async (taskId: string) => {
+  try {
+    const task = await db.task.findUnique({
+      where: {
+        id: taskId,
+      },
+    });
+
+    return task;
+  } catch (error) {
+    console.error('[getTask] Database query failed:', error);
+    throw error;
+  }
+};
+
+const getAutomation = async (automationId: string) => {
+  try {
+    const automation = await db.evidenceAutomation.findUnique({
+      where: {
+        id: automationId,
+      },
+    });
+
+    return automation;
+  } catch (error) {
+    console.error('[getAutomation] Database query failed:', error);
+    throw error;
+  }
+};
+
+const getAutomationRuns = async (automationId: string) => {
+  const runs = await db.evidenceAutomationRun.findMany({
+    where: {
+      evidenceAutomationId: automationId,
+    },
+    include: {
+      evidenceAutomation: {
+        select: {
+          name: true,
+        },
+      },
+    },
+    orderBy: {
+      createdAt: 'desc',
+    },
+  });
+
+  return runs;
+};
+
+const getAutomationVersions = async (automationId: string) => {
+  const versions = await db.evidenceAutomationVersion.findMany({
+    where: {
+      evidenceAutomationId: automationId,
+    },
+    orderBy: {
+      version: 'desc',
+    },
+    take: 10,
+  });
+
+  return versions;
+};
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
new file mode 100644
index 000000000..2903599e4
--- /dev/null
+++ b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/components/AutomationRunsCard.tsx
@@ -0,0 +1,262 @@
+'use client';
+
+import { Badge } from '@comp/ui/badge';
+import { Button } from '@comp/ui/button';
+import { Card, CardContent, CardHeader, CardTitle } from '@comp/ui/card';
+import { EvidenceAutomationRun, EvidenceAutomationRunStatus } from '@db';
+import { formatDistanceToNow } from 'date-fns';
+import { Activity, ChevronDown } from 'lucide-react';
+import { useMemo, useState } from 'react';
+
+type AutomationRunWithName = EvidenceAutomationRun & {
+  evidenceAutomation: {
+    name: string;
+  };
+};
+
+interface AutomationRunsCardProps {
+  runs: AutomationRunWithName[];
+}
+
+export function AutomationRunsCard({ runs }: AutomationRunsCardProps) {
+  const [expandedId, setExpandedId] = useState<string | null>(null);
+  const [showAll, setShowAll] = useState(false);
+
+  // Group runs by date
+  const groupedRuns = useMemo(() => {
+    const groups: Record<string, AutomationRunWithName[]> = {};
+
+    runs?.forEach((run) => {
+      const date = new Date(run.createdAt).toLocaleDateString('en-US', {
+        month: 'short',
+        day: 'numeric',
+        year: 'numeric',
+      });
+      if (!groups[date]) {
+        groups[date] = [];
+      }
+      groups[date].push(run);
+    });
+
+    return groups;
+  }, [runs]);
+
+  if (!runs || runs.length === 0) {
+    return (
+      <Card className="overflow-hidden">
+        <CardHeader className="pb-4 bg-gradient-to-br from-muted/30 to-transparent">
+          <CardTitle className="text-sm font-medium flex items-center gap-2">
+            <div className="p-1.5 rounded-xs bg-primary/10">
+              <Activity className="h-3.5 w-3.5 text-primary" />
+            </div>
+            Automation History
+          </CardTitle>
+        </CardHeader>
+        <CardContent className="py-8">
+          <div className="text-center space-y-2">
+            <p className="text-sm text-muted-foreground">No automation runs yet</p>
+            <p className="text-xs text-muted-foreground">
+              Runs will appear here once automations are executed
+            </p>
+          </div>
+        </CardContent>
+      </Card>
+    );
+  }
+
+  const sortedRuns = [...runs].sort(
+    (a, b) => new Date(b.createdAt).getTime() - new Date(a.createdAt).getTime(),
+  );
+
+  const displayRuns = showAll ? sortedRuns : sortedRuns.slice(0, 3);
+  const hasMore = runs.length > 3;
+
+  const getStatusStyles = (status: EvidenceAutomationRunStatus) => {
+    switch (status) {
+      case 'completed':
+        return {
+          dot: 'bg-chart-positive shadow-[0_0_8px_rgba(0,76,58,0.4)]',
+          text: 'text-chart-positive',
+          bg: 'bg-chart-positive/5',
+        };
+      case 'failed':
+        return {
+          dot: 'bg-chart-destructive shadow-[0_0_8px_rgba(255,0,0,0.3)]',
+          text: 'text-chart-destructive',
+          bg: 'bg-chart-destructive/5',
+        };
+      case 'running':
+        return {
+          dot: 'bg-chart-other animate-pulse shadow-[0_0_8px_rgba(32,128,141,0.4)]',
+          text: 'text-chart-other',
+          bg: 'bg-chart-other/5',
+        };
+      case 'pending':
+        return {
+          dot: 'bg-chart-neutral shadow-[0_0_6px_rgba(255,192,7,0.3)]',
+          text: 'text-chart-neutral',
+          bg: 'bg-chart-neutral/5',
+        };
+      case 'cancelled':
+        return {
+          dot: 'bg-chart-warning',
+          text: 'text-chart-warning',
+          bg: 'bg-chart-warning/5',
+        };
+    }
+  };
+
+  return (
+    <Card className="overflow-hidden">
+      <CardHeader className="pb-4 bg-gradient-to-br from-muted/30 to-transparent">
+        <CardTitle className="text-sm font-medium flex items-center gap-2">
+          <div className="p-1.5 rounded-xs bg-primary/10">
+            <Activity className="h-3.5 w-3.5 text-primary" />
+          </div>
+          Automation History
+        </CardTitle>
+      </CardHeader>
+      <CardContent className="space-y-4 pt-4">
+        {Object.entries(groupedRuns).map(([date, dateRuns]) => {
+          const visibleRuns = showAll ? dateRuns : dateRuns.slice(0, 3);
+
+          return (
+            <div key={date} className="space-y-2">
+              <p className="text-sm font-medium text-muted-foreground">{date}</p>
+              <div className="space-y-1">
+                {visibleRuns.map((run, index) => {
+                  const timeAgo = formatDistanceToNow(new Date(run.createdAt), { addSuffix: true });
+                  const styles = getStatusStyles(run.status);
+                  const isFailed = run.status === 'failed';
+                  const isFirst = index === 0;
+                  const isExpanded = expandedId === run.id;
+                  const hasDetails = !!(run.logs || run.output);
+
+                  return (
+                    <div
+                      key={run.id}
+                      className={`group relative rounded-xs border transition-all duration-300 ${styles.bg} ${
+                        isFirst
+                          ? 'border-primary/20 shadow-sm hover:shadow-md hover:border-primary/30'
+                          : 'border-border/50 hover:border-border hover:shadow-sm'
+                      }`}
+                    >
+                      <button
+                        onClick={() => setExpandedId(isExpanded ? null : run.id)}
+                        className="w-full text-left"
+                        disabled={!hasDetails}
+                      >
+                        <div className="flex items-start gap-3 px-4 py-3">
+                          {/* Status indicator dot with glow */}
+                          <div
+                            className={`h-2 w-2 rounded-full flex-shrink-0 mt-1.5 ${styles.dot}`}
+                          />
+
+                          {/* Content */}
+                          <div className="flex-1 min-w-0 space-y-1">
+                            <div className="flex items-center justify-between gap-3">
+                              <div className="flex items-center gap-2 flex-1 min-w-0">
+                                <p className="text-sm text-foreground font-medium truncate">
+                                  {run.evidenceAutomation.name}
+                                </p>
+                                {run.version ? (
+                                  <Badge variant="secondary" className="text-[10px] px-1.5 py-0">
+                                    v{run.version}
+                                  </Badge>
+                                ) : (
+                                  <Badge variant="outline" className="text-[10px] px-1.5 py-0">
+                                    draft
+                                  </Badge>
+                                )}
+                              </div>
+                              {hasDetails && (
+                                <ChevronDown
+                                  className={`h-4 w-4 text-muted-foreground transition-transform duration-700 ease-in-out ${
+                                    isExpanded ? 'rotate-180' : ''
+                                  }`}
+                                />
+                              )}
+                            </div>
+
+                            <div className="flex items-center gap-2 text-xs text-muted-foreground">
+                              <span className={`font-medium ${styles.text}`}>
+                                {run.status.charAt(0).toUpperCase() + run.status.slice(1)}
+                              </span>
+                              <span className="text-[10px]">•</span>
+                              <span>{timeAgo}</span>
+                              {run.triggeredBy && (
+                                <>
+                                  <span className="text-[10px]">•</span>
+                                  <span className="capitalize font-medium">{run.triggeredBy}</span>
+                                </>
+                              )}
+                            </div>
+                          </div>
+                        </div>
+                      </button>
+
+                      {/* Expandable details with CSS grid animation */}
+                      <div
+                        className={`grid transition-all duration-700 ease-in-out ${
+                          isExpanded ? 'grid-rows-[1fr]' : 'grid-rows-[0fr]'
+                        }`}
+                      >
+                        <div className="overflow-hidden">
+                          <div className="px-4 pb-3 pt-3 space-y-3 border-t border-border/50">
+                            {/* Logs */}
+                            {run.logs && (
+                              <div className="space-y-1">
+                                <p className="text-xs font-medium text-muted-foreground">Logs</p>
+                                <pre className="text-xs bg-muted/50 p-2 rounded-xs overflow-x-auto max-h-40 overflow-y-auto font-mono">
+                                  {typeof run.logs === 'string'
+                                    ? run.logs
+                                    : JSON.stringify(run.logs, null, 2)}
+                                </pre>
+                              </div>
+                            )}
+
+                            {/* Output */}
+                            {run.output && (
+                              <div className="space-y-1">
+                                <p className="text-xs font-medium text-muted-foreground">Output</p>
+                                <pre className="text-xs bg-muted/50 p-2 rounded-xs overflow-x-auto max-h-40 overflow-y-auto font-mono">
+                                  {typeof run.output === 'string'
+                                    ? run.output
+                                    : JSON.stringify(run.output, null, 2)}
+                                </pre>
+                              </div>
+                            )}
+
+                            {/* Error message if failed */}
+                            {isFailed && run.error && (
+                              <div className="px-2 py-1.5 rounded-xs bg-chart-destructive/10 border border-chart-destructive/20">
+                                <p className="text-xs text-chart-destructive/90">{run.error}</p>
+                              </div>
+                            )}
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+                  );
+                })}
+              </div>
+            </div>
+          );
+        })}
+
+        {hasMore && (
+          <div className="pt-3">
+            <Button
+              variant="ghost"
+              size="sm"
+              onClick={() => setShowAll(!showAll)}
+              className="w-full text-xs"
+            >
+              {showAll ? 'Show less' : `Show ${runs.length - 3} more`}
+            </Button>
+          </div>
+        )}
+      </CardContent>
+    </Card>
+  );
+}
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 2fe387777..ab6518fed 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
@@ -11,28 +11,55 @@ import {
   DialogHeader,
   DialogTitle,
 } from '@comp/ui/dialog';
-import { CommentEntityType, type Control, type Member, type Task, type User } from '@db';
+import {
+  CommentEntityType,
+  EvidenceAutomation,
+  EvidenceAutomationRun,
+  type Control,
+  type Member,
+  type Task,
+  type User,
+} from '@db';
 import { RefreshCw, Trash2 } from 'lucide-react';
 import { useAction } from 'next-safe-action/hooks';
-import { useParams } from 'next/navigation';
-import { useMemo, useState } from 'react';
+import { useFeatureFlagEnabled } from 'posthog-js/react';
+import { useState } from 'react';
 import { toast } from 'sonner';
 import { Comments } from '../../../../../../components/comments/Comments';
 import { updateTask } from '../../actions/updateTask';
+import { useTask } from '../hooks/use-task';
+import { useTaskAutomations } from '../hooks/use-task-automations';
+import { TaskAutomations } from './TaskAutomations';
 import { TaskDeleteDialog } from './TaskDeleteDialog';
 import { TaskMainContent } from './TaskMainContent';
 import { TaskPropertiesSidebar } from './TaskPropertiesSidebar';
 
+type AutomationWithRuns = EvidenceAutomation & {
+  runs: EvidenceAutomationRun[];
+};
+
 interface SingleTaskProps {
-  task: Task & { fileUrls?: string[]; controls?: Control[] };
-  members?: (Member & { user: User })[];
+  initialTask: Task & { fileUrls?: string[]; controls?: Control[] };
+  initialMembers?: (Member & { user: User })[];
+  initialAutomations: AutomationWithRuns[];
 }
 
-export function SingleTask({ task, members }: SingleTaskProps) {
+export function SingleTask({ initialTask, initialAutomations }: SingleTaskProps) {
+  // Use SWR hooks with initial data from server
+  const {
+    task,
+    isLoading,
+    mutate: mutateTask,
+  } = useTask({
+    initialData: initialTask,
+  });
+  const { automations } = useTaskAutomations({
+    initialData: initialAutomations,
+  });
+  const isTaskAutomationEnabled = useFeatureFlagEnabled('is-task-automation-enabled');
+
   const [deleteDialogOpen, setDeleteDialogOpen] = useState(false);
   const [isRegenerateConfirmOpen, setRegenerateConfirmOpen] = useState(false);
-  const params = useParams<{ orgId: string }>();
-  const orgIdFromParams = params.orgId;
 
   const regenerate = useAction(regenerateTaskAction, {
     onSuccess: () => {
@@ -43,18 +70,15 @@ export function SingleTask({ task, members }: SingleTaskProps) {
     },
   });
 
-  const assignedMember = useMemo(() => {
-    if (!task.assigneeId || !members) return null;
-    return members.find((m) => m.id === task.assigneeId);
-  }, [task.assigneeId, members]);
-
-  const handleUpdateTask = (
+  const handleUpdateTask = async (
     data: Partial<Pick<Task, 'status' | 'assigneeId' | 'frequency' | 'department' | 'reviewDate'>>,
   ) => {
     const updatePayload: Partial<
       Pick<Task, 'status' | 'assigneeId' | 'frequency' | 'department' | 'reviewDate'>
     > = {};
 
+    if (!task) return;
+
     if (data.status !== undefined) {
       updatePayload.status = data.status;
     }
@@ -71,10 +95,19 @@ export function SingleTask({ task, members }: SingleTaskProps) {
       updatePayload.reviewDate = data.reviewDate;
     }
     if (Object.keys(updatePayload).length > 0) {
-      updateTask({ id: task.id, ...updatePayload });
+      const result = await updateTask({ id: task.id, ...updatePayload });
+      if (result.success) {
+        // Refresh the task data from the server
+        await mutateTask();
+      }
     }
   };
 
+  // Early return if task doesn't exist
+  if (!task || isLoading) {
+    return null;
+  }
+
   return (
     <div className="mx-auto max-w-6xl px-4 animate-in fade-in slide-in-from-bottom-4 duration-500 py-8">
       {/* Main Content Layout */}
@@ -92,24 +125,22 @@ export function SingleTask({ task, members }: SingleTaskProps) {
           </div>
 
           {/* Main Content Area */}
-          <div className="space-y-6">
+          <div className="space-y-4">
             <TaskMainContent task={task} showComments={false} />
 
             {/* Comments Section - integrated */}
-            <div className="pt-6">
-              <Comments
-                entityId={task.id}
-                entityType={CommentEntityType.task}
-                variant="inline"
-                title=""
-              />
-            </div>
+            <Comments
+              entityId={task.id}
+              entityType={CommentEntityType.task}
+              variant="inline"
+              title=""
+            />
           </div>
         </div>
 
         {/* Right Column - Properties (starts at top) */}
-        <div className="lg:col-span-1">
-          <Card className="border border-border bg-card shadow-sm sticky top-4 overflow-hidden">
+        <div className="lg:col-span-1 space-y-4">
+          <Card className="border border-border bg-card shadow-sm overflow-hidden">
             <div className="relative">
               <div className="absolute top-4 right-4 flex items-center gap-1 z-10">
                 <Button
@@ -132,18 +163,16 @@ export function SingleTask({ task, members }: SingleTaskProps) {
                 </Button>
               </div>
               <div className="p-6">
-                <TaskPropertiesSidebar
-                  task={task}
-                  members={members}
-                  assignedMember={assignedMember}
-                  handleUpdateTask={handleUpdateTask}
-                  onDeleteClick={() => setDeleteDialogOpen(true)}
-                  onRegenerateClick={() => setRegenerateConfirmOpen(true)}
-                  orgId={orgIdFromParams}
-                />
+                <TaskPropertiesSidebar handleUpdateTask={handleUpdateTask} />
               </div>
             </div>
           </Card>
+          {/* Automations section */}
+          {isTaskAutomationEnabled && (
+            <Card className="border border-border bg-card shadow-sm overflow-hidden">
+              <TaskAutomations automations={automations || []} />
+            </Card>
+          )}
         </div>
       </div>
 
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
new file mode 100644
index 000000000..770847b52
--- /dev/null
+++ b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/components/TaskAutomations.tsx
@@ -0,0 +1,132 @@
+'use client';
+
+import { cn } from '@/lib/utils';
+import { Button } from '@comp/ui/button';
+import { CardContent, CardHeader, CardTitle } from '@comp/ui/card';
+import { EvidenceAutomation, EvidenceAutomationRun } from '@db';
+import { formatDistanceToNow } from 'date-fns';
+import { ArrowRight, Code, Loader2, Plus } from 'lucide-react';
+import Link from 'next/link';
+import { useParams, useRouter } from 'next/navigation';
+import { useState } from 'react';
+import { useTaskAutomations } from '../hooks/use-task-automations';
+
+type AutomationWithLatestRun = EvidenceAutomation & {
+  runs: EvidenceAutomationRun[];
+};
+
+export const TaskAutomations = ({ automations }: { automations: AutomationWithLatestRun[] }) => {
+  const { orgId, taskId } = useParams<{ orgId: string; taskId: string }>();
+  const router = useRouter();
+  const [isCreating, setIsCreating] = useState(false);
+  const { mutate: mutateAutomations } = useTaskAutomations();
+
+  const handleCreateAutomation = async () => {
+    // Redirect to automation builder with ephemeral mode
+    // The automation will only be created once the user sends their first message
+    router.push(`/${orgId}/tasks/${taskId}/automation/new`);
+  };
+
+  return (
+    <>
+      <CardHeader className="pb-4">
+        <CardTitle className="text-lg font-semibold flex items-center gap-2">
+          Automated Evidence
+        </CardTitle>
+      </CardHeader>
+
+      <CardContent>
+        {automations.length === 0 ? (
+          <div className="text-center py-8 space-y-4">
+            <div className="w-12 h-12 rounded-full bg-primary/10 flex items-center justify-center mx-auto">
+              <Code className="w-6 h-6 text-primary" />
+            </div>
+            <div className="space-y-2">
+              <h4 className="font-medium text-foreground">No automations yet</h4>
+              <p className="text-sm text-muted-foreground">
+                Create an AI automation to collect evidence for this task
+              </p>
+            </div>
+            <Button onClick={handleCreateAutomation} disabled={isCreating} className="w-full">
+              {isCreating ? (
+                <Loader2 className="w-4 h-4 mr-2 animate-spin" />
+              ) : (
+                <Plus className="w-4 h-4 mr-2" />
+              )}
+              {isCreating ? 'Creating...' : 'Create Automation'}
+            </Button>
+          </div>
+        ) : (
+          <div className="flex flex-col gap-2">
+            {automations.map((automation) => {
+              // Show only the latest version run (ignore draft runs)
+              const latestVersionRun = automation.runs.find((run) => run.version !== null);
+
+              const runStatus = latestVersionRun?.status;
+              const lastRan = latestVersionRun?.createdAt
+                ? formatDistanceToNow(new Date(latestVersionRun.createdAt), { addSuffix: true })
+                : null;
+              const runVersion = latestVersionRun?.version;
+
+              return (
+                <Link
+                  href={`/${orgId}/tasks/${taskId}/automations/${automation.id}/overview`}
+                  key={automation.id}
+                  className={cn(
+                    'flex flex-row items-center justify-between p-3 rounded-lg border border-border',
+                    'hover:scale-102 transition-all duration-300',
+                    'cursor-pointer',
+                  )}
+                >
+                  <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'
+                        }`}
+                      />
+                      <p className="font-medium text-foreground text-xs">{automation.name}</p>
+                    </div>
+                    {latestVersionRun && lastRan ? (
+                      <p className="text-[10px] text-muted-foreground mt-0.5 ml-4">
+                        Last ran {lastRan} (v{runVersion})
+                      </p>
+                    ) : (
+                      <p className="text-[10px] text-muted-foreground mt-0.5 ml-4">
+                        No published runs yet
+                      </p>
+                    )}
+                  </div>
+                  <ArrowRight className="w-4 h-4 flex-shrink-0" />
+                </Link>
+              );
+            })}
+
+            <Button
+              variant="outline"
+              size="sm"
+              className="w-full"
+              onClick={handleCreateAutomation}
+              disabled={isCreating}
+            >
+              {isCreating ? (
+                <Loader2 className="w-4 h-4 mr-2 animate-spin" />
+              ) : (
+                <Plus className="w-4 h-4 mr-2" />
+              )}
+              {isCreating ? 'Creating...' : 'Create Another'}
+            </Button>
+          </div>
+        )}
+      </CardContent>
+    </>
+  );
+};
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/components/TaskBody.tsx b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/components/TaskBody.tsx
index e5166abc7..34778c724 100644
--- a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/components/TaskBody.tsx
+++ b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/components/TaskBody.tsx
@@ -228,7 +228,7 @@ export function TaskBody({
                 return (
                   <div
                     key={attachment.id}
-                    className={`inline-flex items-center gap-2 px-2.5 py-1.5 border rounded-md transition-all group ${getFileTypeStyles()}`}
+                    className={`inline-flex items-center gap-2 px-2.5 py-1.5 border rounded-md transition-all group ${getFileTypeStyles()} `}
                   >
                     {isPDF ? (
                       <FileText className={`h-3.5 w-3.5 ${getFileIconColor()}`} />
@@ -283,7 +283,7 @@ export function TaskBody({
             <button
               onClick={triggerFileInput}
               disabled={isUploading || !!busyAttachmentId}
-              className="w-full rounded-lg border border-dashed border-border/40 bg-transparent px-4 py-8 text-center hover:border-border/60 hover:bg-muted/5 transition-all disabled:opacity-50 disabled:cursor-not-allowed"
+              className="w-full rounded-lg border border-dashed border-border/40 bg-secondary px-4 py-8 text-center hover:border-border/60 hover:bg-muted/40 transition-all disabled:opacity-50 disabled:cursor-not-allowed"
             >
               <div className="flex flex-col items-center gap-2">
                 {isUploading ? (
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/components/TaskPropertiesSidebar.tsx b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/components/TaskPropertiesSidebar.tsx
index 1389cfa28..da06eb905 100644
--- a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/components/TaskPropertiesSidebar.tsx
+++ b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/components/TaskPropertiesSidebar.tsx
@@ -1,39 +1,36 @@
+'use client';
+
+import { useOrganizationMembers } from '@/hooks/use-organization-members';
 import { Avatar, AvatarFallback, AvatarImage } from '@comp/ui/avatar';
 import { Badge } from '@comp/ui/badge';
 import { Button } from '@comp/ui/button';
-import type { Control, Departments, Member, Task, TaskFrequency, TaskStatus, User } from '@db';
+import type { Departments, Member, Task, TaskFrequency, TaskStatus, User } from '@db';
 import { format } from 'date-fns';
-import { Code } from 'lucide-react';
 import Link from 'next/link';
-import { useFeatureFlagEnabled } from 'posthog-js/react';
-import { useState } from 'react';
+import { useParams } from 'next/navigation';
 import { TaskStatusIndicator } from '../../components/TaskStatusIndicator';
+import { useTask } from '../hooks/use-task';
 import { PropertySelector } from './PropertySelector';
 import { DEPARTMENT_COLORS, taskDepartments, taskFrequencies, taskStatuses } from './constants';
 
 interface TaskPropertiesSidebarProps {
-  task: Task & { controls?: Control[] };
-  members?: (Member & { user: User })[];
-  assignedMember: (Member & { user: User }) | null | undefined; // Allow undefined
   handleUpdateTask: (
     data: Partial<Pick<Task, 'status' | 'assigneeId' | 'frequency' | 'department' | 'reviewDate'>>,
   ) => void;
-  onDeleteClick?: () => void;
-  onRegenerateClick?: () => void;
-  orgId: string;
 }
 
-export function TaskPropertiesSidebar({
-  task,
-  members,
-  assignedMember,
-  handleUpdateTask,
-  onDeleteClick,
-  onRegenerateClick,
-  orgId,
-}: TaskPropertiesSidebarProps) {
-  const [dropdownOpen, setDropdownOpen] = useState(false);
-  const isTaskAutomationEnabled = useFeatureFlagEnabled('is-task-automation-enabled');
+export function TaskPropertiesSidebar({ handleUpdateTask }: TaskPropertiesSidebarProps) {
+  const { orgId } = useParams<{ orgId: string }>();
+  const { task, isLoading } = useTask();
+  const { members } = useOrganizationMembers();
+
+  console.log('members', members);
+
+  const assignedMember =
+    !task?.assigneeId || !members ? null : members.find((m) => m.id === task.assigneeId);
+
+  if (isLoading) return <div>Loading...</div>;
+  if (!task) return null;
 
   return (
     <div className="space-y-4">
@@ -257,26 +254,11 @@ export function TaskPropertiesSidebar({
                 {format(new Date(task.reviewDate), 'M/d/yyyy')}
               </span>
             ) : (
-              <span className="text-sm px-1 font-medium">None</span>
+              <span className="text-sm px-2 font-medium">None</span>
             )}
           </div>
         </div>
       </div>
-
-      {/* Automation Button */}
-      {isTaskAutomationEnabled && (
-        <div className="mt-6">
-          <Link href={`/${orgId}/tasks/${task.id}/automation`} className="block">
-            <Button
-              className="w-full bg-primary text-primary-foreground hover:bg-primary/90"
-              size="sm"
-            >
-              <Code className="h-4 w-4" />
-              Integration Builder
-            </Button>
-          </Link>
-        </div>
-      )}
     </div>
   );
 }
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/hooks/use-task-automation-runs.ts b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/hooks/use-task-automation-runs.ts
new file mode 100644
index 000000000..e9079486f
--- /dev/null
+++ b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/hooks/use-task-automation-runs.ts
@@ -0,0 +1,64 @@
+import { api } from '@/lib/api-client';
+import { EvidenceAutomationRun } from '@db';
+import { useParams } from 'next/navigation';
+import useSWR from 'swr';
+
+type AutomationRunWithName = EvidenceAutomationRun & {
+  evidenceAutomation: {
+    name: string;
+  };
+};
+
+interface UseTaskAutomationRunsReturn {
+  runs: AutomationRunWithName[] | undefined;
+  isLoading: boolean;
+  isError: boolean;
+  error: Error | undefined;
+  mutate: () => Promise<any>;
+}
+
+interface UseTaskAutomationRunsOptions {
+  initialData?: AutomationRunWithName[];
+}
+
+export function useTaskAutomationRuns({
+  initialData,
+}: UseTaskAutomationRunsOptions = {}): UseTaskAutomationRunsReturn {
+  const { orgId, taskId } = useParams<{
+    orgId: string;
+    taskId: string;
+  }>();
+
+  const { data, error, isLoading, mutate } = useSWR(
+    [`task-automation-runs-${taskId}`, orgId, taskId],
+    async () => {
+      const response = await api.get<AutomationRunWithName[]>(
+        `/v1/tasks/${taskId}/automation-runs`,
+        orgId,
+      );
+
+      if (response.error) {
+        throw new Error(response.error);
+      }
+
+      if (!response.data) {
+        throw new Error('Failed to fetch automation runs');
+      }
+
+      return response.data;
+    },
+    {
+      fallbackData: initialData,
+      revalidateOnFocus: true,
+      revalidateOnReconnect: true,
+    },
+  );
+
+  return {
+    runs: data,
+    isLoading,
+    isError: !!error,
+    error: error as Error | undefined,
+    mutate,
+  };
+}
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/hooks/use-task-automations.ts b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/hooks/use-task-automations.ts
new file mode 100644
index 000000000..9141946c6
--- /dev/null
+++ b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/hooks/use-task-automations.ts
@@ -0,0 +1,62 @@
+import { api } from '@/lib/api-client';
+import { EvidenceAutomation, EvidenceAutomationRun } from '@db';
+import { useParams } from 'next/navigation';
+import useSWR from 'swr';
+
+type AutomationWithRuns = EvidenceAutomation & {
+  runs: EvidenceAutomationRun[];
+};
+
+interface UseTaskAutomationsReturn {
+  automations: AutomationWithRuns[] | undefined;
+  isLoading: boolean;
+  isError: boolean;
+  error: Error | undefined;
+  mutate: () => Promise<any>;
+}
+
+interface UseTaskAutomationsOptions {
+  initialData?: AutomationWithRuns[];
+}
+
+export function useTaskAutomations({
+  initialData,
+}: UseTaskAutomationsOptions = {}): UseTaskAutomationsReturn {
+  const { orgId, taskId } = useParams<{
+    orgId: string;
+    taskId: string;
+  }>();
+
+  const { data, error, isLoading, mutate } = useSWR(
+    [`task-automations-${taskId}`, orgId, taskId],
+    async () => {
+      const response = await api.get<{
+        success: boolean;
+        automations: AutomationWithRuns[];
+      }>(`/v1/tasks/${taskId}/automations`, orgId);
+
+      if (response.error) {
+        throw new Error(response.error);
+      }
+
+      if (!response.data?.success) {
+        throw new Error('Failed to fetch automations');
+      }
+
+      return response.data.automations;
+    },
+    {
+      fallbackData: initialData,
+      revalidateOnFocus: false,
+      revalidateOnReconnect: true,
+    },
+  );
+
+  return {
+    automations: data,
+    isLoading,
+    isError: !!error,
+    error: error as Error | undefined,
+    mutate,
+  };
+}
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/hooks/use-task.ts b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/hooks/use-task.ts
new file mode 100644
index 000000000..c8db40aef
--- /dev/null
+++ b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/hooks/use-task.ts
@@ -0,0 +1,58 @@
+import { api } from '@/lib/api-client';
+import { Control, Task } from '@db';
+import { useParams } from 'next/navigation';
+import useSWR from 'swr';
+
+interface TaskData extends Task {
+  fileUrls?: string[];
+  controls?: Control[];
+}
+
+interface UseTaskReturn {
+  task: TaskData | undefined;
+  isLoading: boolean;
+  isError: boolean;
+  error: Error | undefined;
+  mutate: () => Promise<any>;
+}
+
+interface UseTaskOptions {
+  initialData?: TaskData;
+}
+
+export function useTask({ initialData }: UseTaskOptions = {}): UseTaskReturn {
+  const { orgId, taskId } = useParams<{
+    orgId: string;
+    taskId: string;
+  }>();
+
+  const { data, error, isLoading, mutate } = useSWR(
+    [`task-${taskId}`, orgId, taskId],
+    async () => {
+      const response = await api.get<TaskData>(`/v1/tasks/${taskId}`, orgId);
+
+      if (response.error) {
+        throw new Error(response.error);
+      }
+
+      if (!response.data) {
+        throw new Error('Failed to fetch task');
+      }
+
+      return response.data;
+    },
+    {
+      fallbackData: initialData,
+      revalidateOnFocus: true,
+      revalidateOnReconnect: true,
+    },
+  );
+
+  return {
+    task: data,
+    isLoading,
+    isError: !!error,
+    error: error as Error | undefined,
+    mutate,
+  };
+}
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/page.tsx b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/page.tsx
index a9607c766..1a30c19b9 100644
--- a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/page.tsx
+++ b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/page.tsx
@@ -1,34 +1,26 @@
-import { auth } from '@/utils/auth';
 import { db } from '@db';
-import { headers } from 'next/headers';
 import { redirect } from 'next/navigation';
 import { SingleTask } from './components/SingleTask';
 
-type Session = Awaited<ReturnType<typeof auth.api.getSession>>;
-
 export default async function TaskPage({
   params,
 }: {
   params: Promise<{ taskId: string; orgId: string; locale: string }>;
 }) {
   const { taskId, orgId } = await params;
-  const session = await auth.api.getSession({
-    headers: await headers(),
-  });
-
-  const [task, members] = await Promise.all([getTask(taskId, session), getMembers(orgId, session)]);
+  const task = await getTask(taskId);
 
   if (!task) {
     redirect(`/${orgId}/tasks`);
   }
 
-  return <SingleTask task={task} members={members} />;
-}
+  const automations = await getAutomations(taskId);
 
-const getTask = async (taskId: string, session: Session) => {
-  const activeOrgId = session?.session.activeOrganizationId;
+  return <SingleTask initialTask={task} initialAutomations={automations} />;
+}
 
-  if (!activeOrgId) {
+const getTask = async (taskId: string) => {
+  if (!taskId) {
     console.warn('Could not determine active organization ID in getTask');
     return null;
   }
@@ -37,7 +29,6 @@ const getTask = async (taskId: string, session: Session) => {
     const task = await db.task.findUnique({
       where: {
         id: taskId,
-        organizationId: activeOrgId,
       },
       include: {
         controls: true,
@@ -51,21 +42,28 @@ const getTask = async (taskId: string, session: Session) => {
   }
 };
 
-const getMembers = async (orgId: string, session: Session) => {
-  const activeOrgId = orgId ?? session?.session.activeOrganizationId;
-  if (!activeOrgId) {
-    console.warn('Could not determine active organization ID in getMembers');
+const getAutomations = async (taskId: string) => {
+  if (!taskId) {
+    console.warn('Could not determine task ID in getAutomations');
     return [];
   }
 
-  const members = await db.member.findMany({
+  const automations = await db.evidenceAutomation.findMany({
     where: {
-      organizationId: activeOrgId,
-      role: {
-        notIn: ['employee'],
+      taskId: taskId,
+    },
+    include: {
+      runs: {
+        orderBy: {
+          createdAt: 'desc',
+        },
+        take: 1,
       },
     },
-    include: { user: true },
+    orderBy: {
+      createdAt: 'asc',
+    },
   });
-  return members;
+
+  return automations;
 };
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/actions/updateTask.ts b/apps/app/src/app/(app)/[orgId]/tasks/actions/updateTask.ts
index 25a30e5d9..020492bf3 100644
--- a/apps/app/src/app/(app)/[orgId]/tasks/actions/updateTask.ts
+++ b/apps/app/src/app/(app)/[orgId]/tasks/actions/updateTask.ts
@@ -30,6 +30,7 @@ export const updateTask = async (input: Partial<Task>) => {
     const orgId = session.session.activeOrganizationId;
 
     revalidatePath(`/${orgId}/tasks`);
+    revalidatePath(`/${orgId}/tasks/${id}`);
 
     return {
       success: true,
diff --git a/apps/app/src/app/api/auth/test-login/route.ts b/apps/app/src/app/api/auth/test-login/route.ts
index 25330a9b1..a0338f9bb 100644
--- a/apps/app/src/app/api/auth/test-login/route.ts
+++ b/apps/app/src/app/api/auth/test-login/route.ts
@@ -208,41 +208,6 @@ async function handleLogin(request: NextRequest) {
 
     // Try alternative approach - create session directly
     console.log('[TEST-LOGIN] Attempting direct session creation...');
-
-    try {
-      const sessionResponse = await auth.api.createSession({
-        body: {
-          userId: user.id,
-        },
-        headers: request.headers,
-        asResponse: true,
-      });
-
-      if (sessionResponse.ok) {
-        const sessionData = await sessionResponse.json();
-        console.log('[TEST-LOGIN] Direct session creation successful');
-        // Continue with the original flow using the session data
-        responseData = { user, session: sessionData.session };
-      } else {
-        let sessionErrorData;
-        try {
-          sessionErrorData = await sessionResponse.json();
-        } catch (err) {
-          sessionErrorData = { parseError: String(err) };
-        }
-        console.error('[TEST-LOGIN] Direct session creation also failed:', sessionErrorData);
-        return NextResponse.json(
-          { error: 'Failed to create session', details: errorData },
-          { status: 400 },
-        );
-      }
-    } catch (sessionError) {
-      console.error('[TEST-LOGIN] Direct session creation error:', sessionError);
-      return NextResponse.json(
-        { error: 'Failed to create session', details: errorData },
-        { status: 400 },
-      );
-    }
   } else {
     // Get the response data from successful sign-in
     try {
diff --git a/apps/app/src/app/api/secrets/route.ts b/apps/app/src/app/api/secrets/route.ts
index afce9cd47..8cbcce324 100644
--- a/apps/app/src/app/api/secrets/route.ts
+++ b/apps/app/src/app/api/secrets/route.ts
@@ -32,7 +32,7 @@ export async function GET(request: NextRequest) {
       headers: request.headers,
     });
 
-    if (!session.user.id) {
+    if (!session?.user.id) {
       return NextResponse.json({ error: 'Unauthorized' }, { status: 401 });
     }
 
diff --git a/apps/app/src/hooks/use-organization-members.ts b/apps/app/src/hooks/use-organization-members.ts
new file mode 100644
index 000000000..d79b17a2d
--- /dev/null
+++ b/apps/app/src/hooks/use-organization-members.ts
@@ -0,0 +1,59 @@
+import { api } from '@/lib/api-client';
+import { Member, User } from '@db';
+import { useParams } from 'next/navigation';
+import useSWR from 'swr';
+
+interface MemberData extends Member {
+  user: User;
+}
+
+interface UseOrganizationMembersReturn {
+  members: MemberData[] | undefined;
+  isLoading: boolean;
+  isError: boolean;
+  error: Error | undefined;
+  mutate: () => Promise<any>;
+}
+
+interface UseOrganizationMembersOptions {
+  initialData?: MemberData[];
+}
+
+export function useOrganizationMembers({
+  initialData,
+}: UseOrganizationMembersOptions = {}): UseOrganizationMembersReturn {
+  const { orgId } = useParams<{
+    orgId: string;
+  }>();
+
+  const { data, error, isLoading, mutate } = useSWR(
+    [`organization-members-${orgId}`, orgId],
+    async () => {
+      const { data } = await api.get<{
+        data: MemberData[];
+        error: string;
+        success: boolean;
+      }>(`/v1/people`, orgId);
+
+      if (!data?.data) {
+        console.error('[useOrganizationMembers] Failed to fetch organization members', data?.error);
+        throw new Error(data?.error);
+      }
+
+      return data?.data || [];
+    },
+    {
+      fallbackData: initialData,
+      revalidateOnFocus: false,
+      revalidateOnReconnect: true,
+    },
+  );
+
+  return {
+    members: data,
+    isLoading,
+    isError: !!error,
+    error: error as Error | undefined,
+    mutate,
+  };
+}
diff --git a/apps/app/src/lib/api-client.ts b/apps/app/src/lib/api-client.ts
index 17fca5c37..bdc693a98 100644
--- a/apps/app/src/lib/api-client.ts
+++ b/apps/app/src/lib/api-client.ts
@@ -51,9 +51,6 @@ export class ApiClient {
 
         if (token) {
           headers['Authorization'] = `Bearer ${token}`;
-          console.log('🎯 Using fresh JWT token for API authentication');
-        } else {
-          console.log('⚠️ No JWT token available for API authentication');
         }
       } catch (error) {
         console.error('❌ Error getting JWT token for API call:', error);
@@ -138,6 +135,21 @@ export class ApiClient {
     });
   }
 
+  /**
+   * PATCH request
+   */
+  async patch<T = unknown>(
+    endpoint: string,
+    body?: unknown,
+    organizationId?: string,
+  ): Promise<ApiResponse<T>> {
+    return this.call<T>(endpoint, {
+      method: 'PATCH',
+      body: body ? JSON.stringify(body) : undefined,
+      organizationId,
+    });
+  }
+
   /**
    * DELETE request
    */
@@ -160,6 +172,9 @@ export const api = {
   put: <T = unknown>(endpoint: string, body?: unknown, organizationId?: string) =>
     apiClient.put<T>(endpoint, body, organizationId),
 
+  patch: <T = unknown>(endpoint: string, body?: unknown, organizationId?: string) =>
+    apiClient.patch<T>(endpoint, body, organizationId),
+
   delete: <T = unknown>(endpoint: string, organizationId?: string) =>
     apiClient.delete<T>(endpoint, organizationId),
 };
diff --git a/bun.lock b/bun.lock
index 5aa42728c..65df7c4ae 100644
--- a/bun.lock
+++ b/bun.lock
@@ -74,6 +74,7 @@
         "@trycompai/db": "^1.3.7",
         "archiver": "^7.0.1",
         "axios": "^1.12.2",
+        "better-auth": "^1.3.27",
         "class-transformer": "^0.5.1",
         "class-validator": "^0.14.2",
         "jose": "^6.0.12",
@@ -118,7 +119,7 @@
         "@ai-sdk/groq": "^2.0.0",
         "@ai-sdk/openai": "^2.0.0",
         "@ai-sdk/provider": "^2.0.0",
-        "@ai-sdk/react": "^2.0.0",
+        "@ai-sdk/react": "^2.0.60",
         "@ai-sdk/rsc": "^1.0.0",
         "@aws-sdk/client-lambda": "^3.891.0",
         "@aws-sdk/client-s3": "^3.859.0",
@@ -171,12 +172,13 @@
         "@upstash/ratelimit": "^2.0.5",
         "@vercel/sandbox": "^0.0.21",
         "@vercel/sdk": "^1.7.1",
-        "ai": "^5.0.0",
+        "ai": "^5.0.60",
         "axios": "^1.9.0",
         "better-auth": "^1.3.27",
         "botid": "^1.5.5",
         "canvas-confetti": "^1.9.3",
         "d3": "^7.9.0",
+        "date-fns": "^4.1.0",
         "dub": "^0.66.1",
         "framer-motion": "^12.18.1",
         "geist": "^1.3.1",
@@ -481,7 +483,7 @@
 
     "@ai-sdk/anthropic": ["@ai-sdk/anthropic@2.0.27", "", { "dependencies": { "@ai-sdk/provider": "2.0.0", "@ai-sdk/provider-utils": "3.0.12" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-tGXdWNs+dMZLsn6yVroz9PqPZbCY6kqwGl/xxFVxJWDrTPGj3+1t1vE7pzTZ3vDOiG05iVC7wzlXwV2Or650YA=="],
 
-    "@ai-sdk/gateway": ["@ai-sdk/gateway@1.0.39", "", { "dependencies": { "@ai-sdk/provider": "2.0.0", "@ai-sdk/provider-utils": "3.0.12", "@vercel/oidc": "3.0.2" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-ijYCKG2sbn2RBVfIgaXNXvzHAf2HpFXxQODtjMI+T7Z4CLryflytchsZZ9qrGtsjiQVopKOV6m6kj4lq5fnbsg=="],
+    "@ai-sdk/gateway": ["@ai-sdk/gateway@1.0.40", "", { "dependencies": { "@ai-sdk/provider": "2.0.0", "@ai-sdk/provider-utils": "3.0.12", "@vercel/oidc": "3.0.2" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-zlixM9jac0w0jjYl5gwNq+w9nydvraAmLaZQbbh+QpHU+OPkTIZmyBcKeTq5eGQKQxhi+oquHxzCSKyJx3egGw=="],
 
     "@ai-sdk/groq": ["@ai-sdk/groq@2.0.24", "", { "dependencies": { "@ai-sdk/provider": "2.0.0", "@ai-sdk/provider-utils": "3.0.12" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-PCtNwFsakxR6B/o+l3gtxlPIwN8lawK3vvOjRdC759Y8WtNxCv5RUs0JsxIKyAZxO+RBEy0AoL8xTQUy8fn3gw=="],
 
@@ -491,9 +493,9 @@
 
     "@ai-sdk/provider-utils": ["@ai-sdk/provider-utils@3.0.12", "", { "dependencies": { "@ai-sdk/provider": "2.0.0", "@standard-schema/spec": "^1.0.0", "eventsource-parser": "^3.0.5" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-ZtbdvYxdMoria+2SlNarEk6Hlgyf+zzcznlD55EAl+7VZvJaSg2sqPvwArY7L6TfDEDJsnCq0fdhBSkYo0Xqdg=="],
 
-    "@ai-sdk/react": ["@ai-sdk/react@2.0.69", "", { "dependencies": { "@ai-sdk/provider-utils": "3.0.12", "ai": "5.0.69", "swr": "^2.2.5", "throttleit": "2.1.0" }, "peerDependencies": { "react": "^18 || ^19 || ^19.0.0-rc", "zod": "^3.25.76 || ^4.1.8" }, "optionalPeers": ["zod"] }, "sha512-/9d+p82R7b3poaNjp1rPuyuh+w8P/ikYllYu5b22OWk74WoL8Aw7HjfXDdVIzCRiV9EK0sNfcXpa+ghiMh78Hw=="],
+    "@ai-sdk/react": ["@ai-sdk/react@2.0.70", "", { "dependencies": { "@ai-sdk/provider-utils": "3.0.12", "ai": "5.0.70", "swr": "^2.2.5", "throttleit": "2.1.0" }, "peerDependencies": { "react": "^18 || ^19 || ^19.0.0-rc", "zod": "^3.25.76 || ^4.1.8" }, "optionalPeers": ["zod"] }, "sha512-84So0vv9R2eL+7XAS1xAoqCx1jQGKb2WH8miJV8rBvF1QF9G5otFm35LhPPwZyJDq68vuVsvhIde1yzDCw2B8A=="],
 
-    "@ai-sdk/rsc": ["@ai-sdk/rsc@1.0.69", "", { "dependencies": { "@ai-sdk/provider": "2.0.0", "@ai-sdk/provider-utils": "3.0.12", "ai": "5.0.69", "jsondiffpatch": "0.6.0" }, "peerDependencies": { "react": "^18 || ^19 || ^19.0.0-rc", "zod": "^3.25.76 || ^4.1.8" }, "optionalPeers": ["zod"] }, "sha512-vU6zfVkMXOmj/G4FhJKyas2xujwIHj87T0ZxQu9UJVyvdDo7NY+8qiV/IOZBCq6Nwef0HyFOc1VmisfY+e7O2A=="],
+    "@ai-sdk/rsc": ["@ai-sdk/rsc@1.0.70", "", { "dependencies": { "@ai-sdk/provider": "2.0.0", "@ai-sdk/provider-utils": "3.0.12", "ai": "5.0.70", "jsondiffpatch": "0.6.0" }, "peerDependencies": { "react": "^18 || ^19 || ^19.0.0-rc", "zod": "^3.25.76 || ^4.1.8" }, "optionalPeers": ["zod"] }, "sha512-u2lo/JI1u/pLwVmfdyhQJqgr3FCXPqVMQlym4DL3AYOLn1AtTiuT9EhKgRrsFok34jyYL4j4IxbzjLYa/irLzw=="],
 
     "@alloc/quick-lru": ["@alloc/quick-lru@5.2.0", "", {}, "sha512-UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw=="],
 
@@ -1045,7 +1047,7 @@
 
     "@jridgewell/sourcemap-codec": ["@jridgewell/sourcemap-codec@1.5.5", "", {}, "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og=="],
 
-    "@jridgewell/trace-mapping": ["@jridgewell/trace-mapping@0.3.9", "", { "dependencies": { "@jridgewell/resolve-uri": "^3.0.3", "@jridgewell/sourcemap-codec": "^1.4.10" } }, "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ=="],
+    "@jridgewell/trace-mapping": ["@jridgewell/trace-mapping@0.3.31", "", { "dependencies": { "@jridgewell/resolve-uri": "^3.1.0", "@jridgewell/sourcemap-codec": "^1.4.14" } }, "sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw=="],
 
     "@jsonhero/path": ["@jsonhero/path@1.0.21", "", {}, "sha512-gVUDj/92acpVoJwsVJ/RuWOaHyG4oFzn898WNGQItLCTQ+hOaVlEaImhwE1WqOTf+l3dGOUkbSiVKlb3q1hd1Q=="],
 
@@ -1063,7 +1065,7 @@
 
     "@microsoft/tsdoc": ["@microsoft/tsdoc@0.15.1", "", {}, "sha512-4aErSrCR/On/e5G2hDP0wjooqDdauzEbIq8hIkIe5pXV0rtWJZvdCEKL0ykZxex+IxIwBp0eGeV48hQN07dXtw=="],
 
-    "@monaco-editor/loader": ["@monaco-editor/loader@1.6.0", "", { "dependencies": { "state-local": "^1.0.6" } }, "sha512-PdWBZkPb2Amc1kxRsIEyQFkAya6PzUvSf4waXMPt7I05Azm4e2hQuViBVjfw1Mmck98GG2TqecLzWtg1tbyriw=="],
+    "@monaco-editor/loader": ["@monaco-editor/loader@1.6.1", "", { "dependencies": { "state-local": "^1.0.6" } }, "sha512-w3tEnj9HYEC73wtjdpR089AqkUPskFRcdkxsiSFt3SoUc3OHpmu+leP94CXBm4mHfefmhsdfI0ZQu6qJ0wgtPg=="],
 
     "@monaco-editor/react": ["@monaco-editor/react@4.7.0", "", { "dependencies": { "@monaco-editor/loader": "^1.5.0" }, "peerDependencies": { "monaco-editor": ">= 0.25.0 < 1", "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0", "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0" } }, "sha512-cyzXQCtO47ydzxpQtCGSQGOC8Gk3ZUeBXFAxD+CWXYFo5OqZyZUonFl0DwUlTyAfRHntBfw2p3w4s9R6oe1eCA=="],
 
@@ -1289,7 +1291,7 @@
 
     "@popperjs/core": ["@popperjs/core@2.11.8", "", {}, "sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A=="],
 
-    "@posthog/core": ["@posthog/core@1.2.4", "", {}, "sha512-o2TkycuV98PtAkcqE8B1DJv5LBvHEDTWirK5TlkQMeF2MJg0BYliY95CeRZFILNgZJCbI3k/fhahSMRQlpXOMg=="],
+    "@posthog/core": ["@posthog/core@1.3.0", "", {}, "sha512-hxLL8kZNHH098geedcxCz8y6xojkNYbmJEW+1vFXsmPcExyCXIUUJ/34X6xa9GcprKxd0Wsx3vfJQLQX4iVPhw=="],
 
     "@prisma/adapter-pg": ["@prisma/adapter-pg@6.10.1", "", { "dependencies": { "@prisma/driver-adapter-utils": "6.10.1", "postgres-array": "3.0.4" }, "peerDependencies": { "pg": "^8.11.3" } }, "sha512-4Kpz5EV1jEOsKDuKYMjfJKMiIIcsuR9Ou1B8zLzehYtB7/oi+1ooDoK1K+T7sMisHkP69aYat5j0dskxvJTgdQ=="],
 
@@ -1843,13 +1845,13 @@
 
     "@tiptap/extension-strike": ["@tiptap/extension-strike@2.26.3", "", { "peerDependencies": { "@tiptap/core": "^2.7.0" } }, "sha512-Po3al5hP0IwvHHIHYy3DbUvCD/kbYTsi3sWTjPAB9QgqaoJGl+jyhIyha8FsR+U3MCIIJIekMktI5o1+ySMGpg=="],
 
-    "@tiptap/extension-table": ["@tiptap/extension-table@3.6.6", "", { "peerDependencies": { "@tiptap/core": "^3.6.6", "@tiptap/pm": "^3.6.6" } }, "sha512-kPplbVCL5X+eSXjE5rDwmO+N7Fi20EuLs3JeKopHKJtcRWRdS5bTibRueew3p6GRSbMmtHuaBy/XJVF4xBccKA=="],
+    "@tiptap/extension-table": ["@tiptap/extension-table@3.7.0", "", { "peerDependencies": { "@tiptap/core": "^3.7.0", "@tiptap/pm": "^3.7.0" } }, "sha512-MDOJLDWqie9IBl83ywedxI+X5QmW/+qQueuYWC++024SwFIntzWsb3F3JMK+DlFIi2ZSrstZuJNJq7uWPbjNOQ=="],
 
-    "@tiptap/extension-table-cell": ["@tiptap/extension-table-cell@3.6.6", "", { "peerDependencies": { "@tiptap/extension-table": "^3.6.6" } }, "sha512-7EPTu11VTLYPIDVPmDPklK/RV2krcr2AoEFiyj+MRweC0AIdUcJqQWKSaVbfRpWisY2AsndeqzCZDXYW+B59gg=="],
+    "@tiptap/extension-table-cell": ["@tiptap/extension-table-cell@3.7.0", "", { "peerDependencies": { "@tiptap/extension-table": "^3.7.0" } }, "sha512-bUpN28Egox1fAd6FEv++IjGsLjyIYwD9N8ok4EdOEwzeNSX8Jhf7gcTQB9rbiGUUQPLDTOaFooyPtuy1GQ02lg=="],
 
-    "@tiptap/extension-table-header": ["@tiptap/extension-table-header@3.6.6", "", { "peerDependencies": { "@tiptap/extension-table": "^3.6.6" } }, "sha512-jCBiYoncmIO4hiceMExx4jDMfucEZszz5Z1pwtio4b/y2o9e70DzznCsfRKzeN6S2mqHN7J4+I0IBlZHwX1NLg=="],
+    "@tiptap/extension-table-header": ["@tiptap/extension-table-header@3.7.0", "", { "peerDependencies": { "@tiptap/extension-table": "^3.7.0" } }, "sha512-E0C66f2sV1LePHllvqqCCbgwN1k6Ak7J7JcJng68kc2KPBNLAckISBIlNxuSjR1elOl3STaxYXRtxXHpUX4kHA=="],
 
-    "@tiptap/extension-table-row": ["@tiptap/extension-table-row@3.6.6", "", { "peerDependencies": { "@tiptap/extension-table": "^3.6.6" } }, "sha512-JIInYx/jc42swW9O7DWYcmxT9lOBq94KePT8bAy4IBeiwOwoDRpSwRDITNWQuT0ySxAy1F0MMO5n6Bm5DB7+CQ=="],
+    "@tiptap/extension-table-row": ["@tiptap/extension-table-row@3.7.0", "", { "peerDependencies": { "@tiptap/extension-table": "^3.7.0" } }, "sha512-QpJHS7VtbP38Pg2ttguTEwo+2/qR1kXUK5lZDirRYT3uD9w0Yg/eKyQVFOMxcyLV+3AVffg+2uoHHdvLK7S9/Q=="],
 
     "@tiptap/extension-task-item": ["@tiptap/extension-task-item@2.22.3", "", { "peerDependencies": { "@tiptap/core": "^2.7.0", "@tiptap/pm": "^2.7.0" } }, "sha512-aVfSa2dLF77bfXpAlrsfPUNdhiHJhw3VJ/pnCTxrEnBXYilDuH59AhtU6DygSNhMZWUgzI4OPqf3crF+yzrHag=="],
 
@@ -2217,7 +2219,7 @@
 
     "@upstash/ratelimit": ["@upstash/ratelimit@2.0.6", "", { "dependencies": { "@upstash/core-analytics": "^0.0.10" }, "peerDependencies": { "@upstash/redis": "^1.34.3" } }, "sha512-Uak5qklMfzFN5RXltxY6IXRENu+Hgmo9iEgMPOlUs2etSQas2N+hJfbHw37OUy4vldLRXeD0OzL+YRvO2l5acg=="],
 
-    "@upstash/redis": ["@upstash/redis@1.35.5", "", { "dependencies": { "uncrypto": "^0.1.3" } }, "sha512-KdLdNAspQGOTGeC++o2LDBzNbMXrfInnmW5nUJfNXabnVh8X4NPrlJ0X4j75cBUShiMpXB3uI1ql4KpFQeqrHQ=="],
+    "@upstash/redis": ["@upstash/redis@1.35.6", "", { "dependencies": { "uncrypto": "^0.1.3" } }, "sha512-aSEIGJgJ7XUfTYvhQcQbq835re7e/BXjs8Janq6Pvr6LlmTZnyqwT97RziZLO/8AVUL037RLXqqiQC6kCt+5pA=="],
 
     "@use-gesture/core": ["@use-gesture/core@10.3.1", "", {}, "sha512-WcINiDt8WjqBdUXye25anHiNxPc0VOrlT8F6LLkU6cycrOGUDyY/yyFmsg3k8i5OLvv25llc0QC45GhR/C8llw=="],
 
@@ -2311,7 +2313,7 @@
 
     "aggregate-error": ["aggregate-error@3.1.0", "", { "dependencies": { "clean-stack": "^2.0.0", "indent-string": "^4.0.0" } }, "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA=="],
 
-    "ai": ["ai@5.0.69", "", { "dependencies": { "@ai-sdk/gateway": "1.0.39", "@ai-sdk/provider": "2.0.0", "@ai-sdk/provider-utils": "3.0.12", "@opentelemetry/api": "1.9.0" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-b0Zy3/VCfVDVVjXCQqswzQifU2z7mHpJXwjoZMbk8KirZ0WoU/Trz8KWdlTRlsoBuHvE5tnW3+YrY+ghRb/Jkw=="],
+    "ai": ["ai@5.0.70", "", { "dependencies": { "@ai-sdk/gateway": "1.0.40", "@ai-sdk/provider": "2.0.0", "@ai-sdk/provider-utils": "3.0.12", "@opentelemetry/api": "1.9.0" }, "peerDependencies": { "zod": "^3.25.76 || ^4.1.8" } }, "sha512-srJV++Ml1X8I33gTiiJQpq6GUbAv5ivjSzDzzF9SM4d25zq+/m+zTtHBb794tYKTz2PgbJ3oop9+gU50ZdCLbQ=="],
 
     "ajv": ["ajv@6.12.6", "", { "dependencies": { "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", "json-schema-traverse": "^0.4.1", "uri-js": "^4.2.2" } }, "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g=="],
 
@@ -3769,7 +3771,7 @@
 
     "magic-bytes.js": ["magic-bytes.js@1.12.1", "", {}, "sha512-ThQLOhN86ZkJ7qemtVRGYM+gRgR8GEXNli9H/PMvpnZsE44Xfh3wx9kGJaldg314v85m+bFW6WBMaVHJc/c3zA=="],
 
-    "magic-string": ["magic-string@0.30.19", "", { "dependencies": { "@jridgewell/sourcemap-codec": "^1.5.5" } }, "sha512-2N21sPY9Ws53PZvsEpVtNuSW+ScYbQdp4b9qUaL+9QkHUrGFKo56Lg9Emg5s9V/qrtNBmiR01sYhUOwu3H+VOw=="],
+    "magic-string": ["magic-string@0.30.17", "", { "dependencies": { "@jridgewell/sourcemap-codec": "^1.5.0" } }, "sha512-sNPKHvyjVf7gyjwS4xGTaW/mCnF8wnjtifKBEhxfZ7E/S8tQ0rssrwGNn6q8JH/ohItJfSQp9mBtQYuTlH5QnA=="],
 
     "make-dir": ["make-dir@4.0.0", "", { "dependencies": { "semver": "^7.5.3" } }, "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw=="],
 
@@ -4171,7 +4173,7 @@
 
     "picocolors": ["picocolors@1.1.1", "", {}, "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA=="],
 
-    "picomatch": ["picomatch@4.0.3", "", {}, "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q=="],
+    "picomatch": ["picomatch@4.0.2", "", {}, "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg=="],
 
     "pify": ["pify@3.0.0", "", {}, "sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg=="],
 
@@ -4213,9 +4215,9 @@
 
     "postgres-interval": ["postgres-interval@1.2.0", "", { "dependencies": { "xtend": "^4.0.0" } }, "sha512-9ZhXKM/rw350N1ovuWHbGxnGh/SNJ4cnxHiM0rxE4VN41wsg8P8zWn9hv/buK00RP4WvlOyr/RBDiptyxVbkZQ=="],
 
-    "posthog-js": ["posthog-js@1.275.1", "", { "dependencies": { "@posthog/core": "1.2.4", "core-js": "^3.38.1", "fflate": "^0.4.8", "preact": "^10.19.3", "web-vitals": "^4.2.4" }, "peerDependencies": { "@rrweb/types": "2.0.0-alpha.17", "rrweb-snapshot": "2.0.0-alpha.17" }, "optionalPeers": ["@rrweb/types", "rrweb-snapshot"] }, "sha512-ILglAzeUQl7h7rB3axr5rn5j2wBp53XedzJoUha5IC594BsrScdOD9NjLpkDAqV/Q5IsRKXbYOkr+HKaxgb4FA=="],
+    "posthog-js": ["posthog-js@1.275.2", "", { "dependencies": { "@posthog/core": "1.3.0", "core-js": "^3.38.1", "fflate": "^0.4.8", "preact": "^10.19.3", "web-vitals": "^4.2.4" }, "peerDependencies": { "@rrweb/types": "2.0.0-alpha.17", "rrweb-snapshot": "2.0.0-alpha.17" }, "optionalPeers": ["@rrweb/types", "rrweb-snapshot"] }, "sha512-g1fnV/GAcEdwwk4EVbJ1HMZhlhgKYxG1Z5KPGvr+q5re0ltyVq8jFA2PsF333jvOlI8R01LLdpYSIgU8sBiZfg=="],
 
-    "posthog-node": ["posthog-node@5.9.5", "", { "dependencies": { "@posthog/core": "1.2.4" } }, "sha512-Rv82jMVhnxlBNf8wDbP+iAJdZrhU0aHul0LaFrQ/JGxxDiK3EkclIqr+QUwA9CulleTtXf6AIFz22tLvbVs/HA=="],
+    "posthog-node": ["posthog-node@5.10.0", "", { "dependencies": { "@posthog/core": "1.3.0" } }, "sha512-uNN+YUuOdbDSbDMGk/Wq57o2YBEH0Unu1kEq2PuYmqFmnu+oYsKyJBrb58VNwEuYsaXVJmk4FtbD+Tl8BT69+w=="],
 
     "postprocessing": ["postprocessing@6.37.8", "", { "peerDependencies": { "three": ">= 0.157.0 < 0.181.0" } }, "sha512-qTFUKS51z/fuw2U+irz4/TiKJ/0oI70cNtvQG1WxlPKvBdJUfS1CcFswJd5ATY3slotWfvkDDZAsj1X0fU8BOQ=="],
 
@@ -4357,7 +4359,7 @@
 
     "react-hook-form": ["react-hook-form@7.65.0", "", { "peerDependencies": { "react": "^16.8.0 || ^17 || ^18 || ^19" } }, "sha512-xtOzDz063WcXvGWaHgLNrNzlsdFgtUWcb32E6WFaGTd7kPZG3EeDusjdZfUsPwKCKVXy1ZlntifaHZ4l8pAsmw=="],
 
-    "react-hotkeys-hook": ["react-hotkeys-hook@5.2.0", "", { "peerDependencies": { "react": ">=16.8.0", "react-dom": ">=16.8.0" } }, "sha512-6hhPHVuofG8De4yU3jr8Q4EjHsxEnob5I1Dag+OxgDRXX1oARHbmURreXyo2CDTYyz0POmFqdBlW6eAa0MwNLw=="],
+    "react-hotkeys-hook": ["react-hotkeys-hook@5.2.1", "", { "peerDependencies": { "react": ">=16.8.0", "react-dom": ">=16.8.0" } }, "sha512-xbKh6zJxd/vJHT4Bw4+0pBD662Fk20V+VFhLqciCg+manTVO4qlqRqiwFOYelfHN9dBvWj9vxaPkSS26ZSIJGg=="],
 
     "react-icons": ["react-icons@5.5.0", "", { "peerDependencies": { "react": "*" } }, "sha512-MEFcXdkP3dLo8uumGI5xN3lDFNsRtrjbOEKDLD7yv76v4wpnEq2Lt2qeHaQOr34I/wPN3s3+N08WkQ+CW37Xiw=="],
 
@@ -4677,7 +4679,7 @@
 
     "statuses": ["statuses@2.0.2", "", {}, "sha512-DvEy55V3DB7uknRo+4iOGT5fP1slR8wQohVdknigZPMpMstaKJQWhwiYBACJE3Ul2pTnATihhBYnRhZQHGBiRw=="],
 
-    "std-env": ["std-env@3.9.0", "", {}, "sha512-UGvjygr6F6tpH7o2qyqR6QYpwraIjKSdtzyBdyytFOHmPZY917kwdwLG0RbOjWOnKmnm3PeHjaoLLMie7kPLQw=="],
+    "std-env": ["std-env@3.10.0", "", {}, "sha512-5GS12FdOZNliM5mAOxFRg7Ir0pWz8MdpYm6AY6VPkGpbA7ZzmbzNcBJQ0GPvvyWgcY7QAhCgf9Uy89I03faLkg=="],
 
     "stdin-discarder": ["stdin-discarder@0.2.2", "", {}, "sha512-UhDfHmA92YAlNnCfhmq0VeNL5bDbiZGg7sZ2IvPsXubGkiNa9EC+tUTsjBRsYUAz87btI6/1wf4XoVvQ3uRnmQ=="],
 
@@ -5069,7 +5071,7 @@
 
     "victory-vendor": ["victory-vendor@36.9.2", "", { "dependencies": { "@types/d3-array": "^3.0.3", "@types/d3-ease": "^3.0.0", "@types/d3-interpolate": "^3.0.1", "@types/d3-scale": "^4.0.2", "@types/d3-shape": "^3.1.0", "@types/d3-time": "^3.0.0", "@types/d3-timer": "^3.0.0", "d3-array": "^3.1.6", "d3-ease": "^3.0.1", "d3-interpolate": "^3.0.1", "d3-scale": "^4.0.2", "d3-shape": "^3.1.0", "d3-time": "^3.0.0", "d3-timer": "^3.0.1" } }, "sha512-PnpQQMuxlwYdocC8fIJqVXvkeViHYzotI+NJrCuav0ZYFoq912ZHBk3mCeuj+5/VpodOjPe1z0Fk2ihgzlXqjQ=="],
 
-    "vite": ["vite@7.1.9", "", { "dependencies": { "esbuild": "^0.25.0", "fdir": "^6.5.0", "picomatch": "^4.0.3", "postcss": "^8.5.6", "rollup": "^4.43.0", "tinyglobby": "^0.2.15" }, "optionalDependencies": { "fsevents": "~2.3.3" }, "peerDependencies": { "@types/node": "^20.19.0 || >=22.12.0", "jiti": ">=1.21.0", "less": "^4.0.0", "lightningcss": "^1.21.0", "sass": "^1.70.0", "sass-embedded": "^1.70.0", "stylus": ">=0.54.8", "sugarss": "^5.0.0", "terser": "^5.16.0", "tsx": "^4.8.1", "yaml": "^2.4.2" }, "optionalPeers": ["@types/node", "jiti", "less", "lightningcss", "sass", "sass-embedded", "stylus", "sugarss", "terser", "tsx", "yaml"], "bin": { "vite": "bin/vite.js" } }, "sha512-4nVGliEpxmhCL8DslSAUdxlB6+SMrhB0a1v5ijlh1xB1nEPuy1mxaHxysVucLHuWryAxLWg6a5ei+U4TLn/rFg=="],
+    "vite": ["vite@7.1.10", "", { "dependencies": { "esbuild": "^0.25.0", "fdir": "^6.5.0", "picomatch": "^4.0.3", "postcss": "^8.5.6", "rollup": "^4.43.0", "tinyglobby": "^0.2.15" }, "optionalDependencies": { "fsevents": "~2.3.3" }, "peerDependencies": { "@types/node": "^20.19.0 || >=22.12.0", "jiti": ">=1.21.0", "less": "^4.0.0", "lightningcss": "^1.21.0", "sass": "^1.70.0", "sass-embedded": "^1.70.0", "stylus": ">=0.54.8", "sugarss": "^5.0.0", "terser": "^5.16.0", "tsx": "^4.8.1", "yaml": "^2.4.2" }, "optionalPeers": ["@types/node", "jiti", "less", "lightningcss", "sass", "sass-embedded", "stylus", "sugarss", "terser", "tsx", "yaml"], "bin": { "vite": "bin/vite.js" } }, "sha512-CmuvUBzVJ/e3HGxhg6cYk88NGgTnBoOo7ogtfJJ0fefUWAxN/WDSUa50o+oVBxuIhO8FoEZW0j2eW7sfjs5EtA=="],
 
     "vite-node": ["vite-node@3.2.4", "", { "dependencies": { "cac": "^6.7.14", "debug": "^4.4.1", "es-module-lexer": "^1.7.0", "pathe": "^2.0.3", "vite": "^5.0.0 || ^6.0.0 || ^7.0.0-0" }, "bin": { "vite-node": "vite-node.mjs" } }, "sha512-EbKSKh+bh1E1IFxeO0pg1n4dvoOTt0UDiXMd/qn++r98+jPO1xtJilvXldeuQ8giIB5IkpjCgMleHMNEsGH6pg=="],
 
@@ -5195,14 +5197,10 @@
 
     "@angular-devkit/core/ajv": ["ajv@8.17.1", "", { "dependencies": { "fast-deep-equal": "^3.1.3", "fast-uri": "^3.0.1", "json-schema-traverse": "^1.0.0", "require-from-string": "^2.0.2" } }, "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g=="],
 
-    "@angular-devkit/core/picomatch": ["picomatch@4.0.2", "", {}, "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg=="],
-
     "@angular-devkit/core/rxjs": ["rxjs@7.8.1", "", { "dependencies": { "tslib": "^2.1.0" } }, "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg=="],
 
     "@angular-devkit/core/source-map": ["source-map@0.7.4", "", {}, "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA=="],
 
-    "@angular-devkit/schematics/magic-string": ["magic-string@0.30.17", "", { "dependencies": { "@jridgewell/sourcemap-codec": "^1.5.0" } }, "sha512-sNPKHvyjVf7gyjwS4xGTaW/mCnF8wnjtifKBEhxfZ7E/S8tQ0rssrwGNn6q8JH/ohItJfSQp9mBtQYuTlH5QnA=="],
-
     "@angular-devkit/schematics/ora": ["ora@5.4.1", "", { "dependencies": { "bl": "^4.1.0", "chalk": "^4.1.0", "cli-cursor": "^3.1.0", "cli-spinners": "^2.5.0", "is-interactive": "^1.0.0", "is-unicode-supported": "^0.1.0", "log-symbols": "^4.1.0", "strip-ansi": "^6.0.0", "wcwidth": "^1.0.1" } }, "sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ=="],
 
     "@angular-devkit/schematics/rxjs": ["rxjs@7.8.1", "", { "dependencies": { "tslib": "^2.1.0" } }, "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg=="],
@@ -5231,8 +5229,6 @@
 
     "@babel/core/semver": ["semver@6.3.1", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="],
 
-    "@babel/generator/@jridgewell/trace-mapping": ["@jridgewell/trace-mapping@0.3.31", "", { "dependencies": { "@jridgewell/resolve-uri": "^3.1.0", "@jridgewell/sourcemap-codec": "^1.4.14" } }, "sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw=="],
-
     "@babel/helper-compilation-targets/lru-cache": ["lru-cache@5.1.1", "", { "dependencies": { "yallist": "^3.0.2" } }, "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w=="],
 
     "@babel/helper-compilation-targets/semver": ["semver@6.3.1", "", { "bin": { "semver": "bin/semver.js" } }, "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="],
@@ -5263,6 +5259,8 @@
 
     "@comp/api/zod": ["zod@4.1.12", "", {}, "sha512-JInaHOamG8pt5+Ey8kGmdcAcg3OL9reK8ltczgHTAwNhMys/6ThXHityHxVV2p3fkw/c+MAvBHFVYHFZDmjMCQ=="],
 
+    "@cspotcode/source-map-support/@jridgewell/trace-mapping": ["@jridgewell/trace-mapping@0.3.9", "", { "dependencies": { "@jridgewell/resolve-uri": "^3.0.3", "@jridgewell/sourcemap-codec": "^1.4.10" } }, "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ=="],
+
     "@discordjs/rest/@discordjs/collection": ["@discordjs/collection@2.1.1", "", {}, "sha512-LiSusze9Tc7qF03sLCujF5iZp7K+vRNEDBZ86FT9aQAv3vxMLihUvKvpsCWiQ2DJq1tVckopKm1rxomgNUc9hg=="],
 
     "@discordjs/rest/undici": ["undici@6.21.3", "", {}, "sha512-gBLkYIlEnSp8pFbT64yFgGE6UIB9tAkhukC23PmMDCe5Nd+cRqKxSjw5y54MK2AZMgZfJWMaNE4nYUHgi1XEOw=="],
@@ -5301,28 +5299,16 @@
 
     "@jest/core/slash": ["slash@3.0.0", "", {}, "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q=="],
 
-    "@jest/reporters/@jridgewell/trace-mapping": ["@jridgewell/trace-mapping@0.3.31", "", { "dependencies": { "@jridgewell/resolve-uri": "^3.1.0", "@jridgewell/sourcemap-codec": "^1.4.14" } }, "sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw=="],
-
     "@jest/reporters/glob": ["glob@10.4.5", "", { "dependencies": { "foreground-child": "^3.1.0", "jackspeak": "^3.1.2", "minimatch": "^9.0.4", "minipass": "^7.1.2", "package-json-from-dist": "^1.0.0", "path-scurry": "^1.11.1" }, "bin": { "glob": "dist/esm/bin.mjs" } }, "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg=="],
 
     "@jest/reporters/jest-worker": ["jest-worker@30.2.0", "", { "dependencies": { "@types/node": "*", "@ungap/structured-clone": "^1.3.0", "jest-util": "30.2.0", "merge-stream": "^2.0.0", "supports-color": "^8.1.1" } }, "sha512-0Q4Uk8WF7BUwqXHuAjc23vmopWJw5WH7w2tqBoUOZpOjW/ZnR44GXXd1r82RvnmI2GZge3ivrYXk/BE2+VtW2g=="],
 
     "@jest/reporters/slash": ["slash@3.0.0", "", {}, "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q=="],
 
-    "@jest/source-map/@jridgewell/trace-mapping": ["@jridgewell/trace-mapping@0.3.31", "", { "dependencies": { "@jridgewell/resolve-uri": "^3.1.0", "@jridgewell/sourcemap-codec": "^1.4.14" } }, "sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw=="],
-
     "@jest/test-sequencer/slash": ["slash@3.0.0", "", {}, "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q=="],
 
-    "@jest/transform/@jridgewell/trace-mapping": ["@jridgewell/trace-mapping@0.3.31", "", { "dependencies": { "@jridgewell/resolve-uri": "^3.1.0", "@jridgewell/sourcemap-codec": "^1.4.14" } }, "sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw=="],
-
     "@jest/transform/slash": ["slash@3.0.0", "", {}, "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q=="],
 
-    "@jridgewell/gen-mapping/@jridgewell/trace-mapping": ["@jridgewell/trace-mapping@0.3.31", "", { "dependencies": { "@jridgewell/resolve-uri": "^3.1.0", "@jridgewell/sourcemap-codec": "^1.4.14" } }, "sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw=="],
-
-    "@jridgewell/remapping/@jridgewell/trace-mapping": ["@jridgewell/trace-mapping@0.3.31", "", { "dependencies": { "@jridgewell/resolve-uri": "^3.1.0", "@jridgewell/sourcemap-codec": "^1.4.14" } }, "sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw=="],
-
-    "@jridgewell/source-map/@jridgewell/trace-mapping": ["@jridgewell/trace-mapping@0.3.31", "", { "dependencies": { "@jridgewell/resolve-uri": "^3.1.0", "@jridgewell/sourcemap-codec": "^1.4.14" } }, "sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw=="],
-
     "@nangohq/types/type-fest": ["type-fest@4.32.0", "", {}, "sha512-rfgpoi08xagF3JSdtJlCwMq9DGNDE0IMh3Mkpc1wUypg9vPi786AiqeBBKcqvIkq42azsBM85N490fyZjeUftw=="],
 
     "@nestjs/cli/commander": ["commander@4.1.1", "", {}, "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA=="],
@@ -5347,7 +5333,7 @@
 
     "@parcel/watcher/detect-libc": ["detect-libc@1.0.3", "", { "bin": { "detect-libc": "./bin/detect-libc.js" } }, "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg=="],
 
-    "@playwright/experimental-ct-core/vite": ["vite@6.3.6", "", { "dependencies": { "esbuild": "^0.25.0", "fdir": "^6.4.4", "picomatch": "^4.0.2", "postcss": "^8.5.3", "rollup": "^4.34.9", "tinyglobby": "^0.2.13" }, "optionalDependencies": { "fsevents": "~2.3.3" }, "peerDependencies": { "@types/node": "^18.0.0 || ^20.0.0 || >=22.0.0", "jiti": ">=1.21.0", "less": "*", "lightningcss": "^1.21.0", "sass": "*", "sass-embedded": "*", "stylus": "*", "sugarss": "*", "terser": "^5.16.0", "tsx": "^4.8.1", "yaml": "^2.4.2" }, "optionalPeers": ["@types/node", "jiti", "less", "lightningcss", "sass", "sass-embedded", "stylus", "sugarss", "terser", "tsx", "yaml"], "bin": { "vite": "bin/vite.js" } }, "sha512-0msEVHJEScQbhkbVTb/4iHZdJ6SXp/AvxL2sjwYQFfBqleHtnCqv1J3sa9zbWz/6kW1m9Tfzn92vW+kZ1WV6QA=="],
+    "@playwright/experimental-ct-core/vite": ["vite@6.3.7", "", { "dependencies": { "esbuild": "^0.25.0", "fdir": "^6.4.4", "picomatch": "^4.0.2", "postcss": "^8.5.3", "rollup": "^4.34.9", "tinyglobby": "^0.2.13" }, "optionalDependencies": { "fsevents": "~2.3.3" }, "peerDependencies": { "@types/node": "^18.0.0 || ^20.0.0 || >=22.0.0", "jiti": ">=1.21.0", "less": "*", "lightningcss": "^1.21.0", "sass": "*", "sass-embedded": "*", "stylus": "*", "sugarss": "*", "terser": "^5.16.0", "tsx": "^4.8.1", "yaml": "^2.4.2" }, "optionalPeers": ["@types/node", "jiti", "less", "lightningcss", "sass", "sass-embedded", "stylus", "sugarss", "terser", "tsx", "yaml"], "bin": { "vite": "bin/vite.js" } }, "sha512-mQYaKepA0NGMBsz8Xktt3tJUG5ELE2iT7IJ+ssXI6nxVdE2sFc/d/6w/JByqMLvWg8hNKHpPgzjgOkrhpKFnrA=="],
 
     "@pnpm/network.ca-file/graceful-fs": ["graceful-fs@4.2.10", "", {}, "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA=="],
 
@@ -5459,6 +5445,8 @@
 
     "@tailwindcss/node/jiti": ["jiti@2.6.1", "", { "bin": { "jiti": "lib/jiti-cli.mjs" } }, "sha512-ekilCSN1jwRvIbgeg/57YFh8qQDNbwDb9xT/qu2DAHbFFZUicIl4ygVaAvzveMhMVr3LnpSKTNnwt8PoOfmKhQ=="],
 
+    "@tailwindcss/node/magic-string": ["magic-string@0.30.19", "", { "dependencies": { "@jridgewell/sourcemap-codec": "^1.5.5" } }, "sha512-2N21sPY9Ws53PZvsEpVtNuSW+ScYbQdp4b9qUaL+9QkHUrGFKo56Lg9Emg5s9V/qrtNBmiR01sYhUOwu3H+VOw=="],
+
     "@tailwindcss/oxide/tar": ["tar@7.5.1", "", { "dependencies": { "@isaacs/fs-minipass": "^4.0.0", "chownr": "^3.0.0", "minipass": "^7.1.2", "minizlib": "^3.1.0", "yallist": "^5.0.0" } }, "sha512-nlGpxf+hv0v7GkWBK2V9spgactGOp0qvfWRxUMjqHyzrt3SgwE48DIv/FhqPHJYLHpgW1opq3nERbz5Anq7n1g=="],
 
     "@tailwindcss/oxide-wasm32-wasi/@emnapi/core": ["@emnapi/core@1.5.0", "", { "dependencies": { "@emnapi/wasi-threads": "1.1.0", "tslib": "^2.4.0" }, "bundled": true }, "sha512-sbP8GzB1WDzacS8fgNPpHlp6C9VZe+SJP3F90W9rLemaQj2PzIuTEl1qDOYQf58YIpyjViI24y9aPWCjEzY2cg=="],
@@ -5475,6 +5463,8 @@
 
     "@testing-library/dom/pretty-format": ["pretty-format@27.5.1", "", { "dependencies": { "ansi-regex": "^5.0.1", "ansi-styles": "^5.0.0", "react-is": "^17.0.1" } }, "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ=="],
 
+    "@testing-library/jest-dom/aria-query": ["aria-query@5.3.2", "", {}, "sha512-COROpnaoap1E2F000S62r6A60uHZnmlvomhfyT2DlTcrY1OrBKn2UhH7qn5wTC9zMvD0AY7csdPSNwKP+7WiQw=="],
+
     "@testing-library/jest-dom/dom-accessibility-api": ["dom-accessibility-api@0.6.3", "", {}, "sha512-7ZgogeTnjuHbo+ct10G9Ffp0mif17idi0IyWNVA/wcwcm7NPOD/WEHVP3n7n3MhXqxoIYm8d6MuZohYWIZ4T3w=="],
 
     "@trigger.dev/core/@opentelemetry/instrumentation": ["@opentelemetry/instrumentation@0.203.0", "", { "dependencies": { "@opentelemetry/api-logs": "0.203.0", "import-in-the-middle": "^1.8.1", "require-in-the-middle": "^7.1.1" }, "peerDependencies": { "@opentelemetry/api": "^1.3.0" } }, "sha512-ke1qyM+3AK2zPuBPb6Hk/GCsc5ewbLvPNkEuELx/JmANeEp6ZjnZ+wypPAJSucTw0wvCGrUaibDSdcrGFoWxKQ=="],
@@ -5493,6 +5483,8 @@
 
     "@trigger.dev/sdk/uuid": ["uuid@9.0.1", "", { "bin": { "uuid": "dist/bin/uuid" } }, "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA=="],
 
+    "@trycompai/db/dotenv": ["dotenv@16.6.1", "", {}, "sha512-uBq4egWHTcTt33a72vpSG0z3HnPuIl6NqYcTrKEg2azoEyl2hpW0zqlxysq2pK9HlDIHyHyakeYaYnSAwd8bow=="],
+
     "@trycompai/integrations/zod": ["zod@4.1.12", "", {}, "sha512-JInaHOamG8pt5+Ey8kGmdcAcg3OL9reK8ltczgHTAwNhMys/6ThXHityHxVV2p3fkw/c+MAvBHFVYHFZDmjMCQ=="],
 
     "@typescript-eslint/eslint-plugin/ignore": ["ignore@7.0.5", "", {}, "sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg=="],
@@ -5617,6 +5609,8 @@
 
     "fast-png/pako": ["pako@2.1.0", "", {}, "sha512-w+eufiZ1WuJYgPXbV/PO3NCMEc3xqylkKHzp8bxp1uW4qaSNQUkwmLLEc3kKsfz8lpV1F8Ht3U1Cm+9Srog2ug=="],
 
+    "fix-dts-default-cjs-exports/magic-string": ["magic-string@0.30.19", "", { "dependencies": { "@jridgewell/sourcemap-codec": "^1.5.5" } }, "sha512-2N21sPY9Ws53PZvsEpVtNuSW+ScYbQdp4b9qUaL+9QkHUrGFKo56Lg9Emg5s9V/qrtNBmiR01sYhUOwu3H+VOw=="],
+
     "fleetctl/axios": ["axios@1.11.0", "", { "dependencies": { "follow-redirects": "^1.15.6", "form-data": "^4.0.4", "proxy-from-env": "^1.1.0" } }, "sha512-1Lx3WLFQWm3ooKDYZD1eXmoGO9fxYQjrycfHFC8P0sCfQVXyROp0p9PFWBehewBOdCwHc+f/b8I0fMto5eSfwA=="],
 
     "fork-ts-checker-webpack-plugin/cosmiconfig": ["cosmiconfig@8.3.6", "", { "dependencies": { "import-fresh": "^3.3.0", "js-yaml": "^4.1.0", "parse-json": "^5.2.0", "path-type": "^4.0.0" }, "peerDependencies": { "typescript": ">=4.9.5" }, "optionalPeers": ["typescript"] }, "sha512-kcZ6+W5QzcJ3P1Mt+83OUv/oHFqZHIx8DuxG6eZ5RGMERoLqp4BuGjhHLYGK+Kf5XVkQvqBSmAy/nGWN3qDgEA=="],
@@ -5683,8 +5677,6 @@
 
     "istanbul-lib-report/supports-color": ["supports-color@7.2.0", "", { "dependencies": { "has-flag": "^4.0.0" } }, "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw=="],
 
-    "istanbul-lib-source-maps/@jridgewell/trace-mapping": ["@jridgewell/trace-mapping@0.3.31", "", { "dependencies": { "@jridgewell/resolve-uri": "^3.1.0", "@jridgewell/sourcemap-codec": "^1.4.14" } }, "sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw=="],
-
     "its-fine/@types/react-reconciler": ["@types/react-reconciler@0.28.9", "", { "peerDependencies": { "@types/react": "*" } }, "sha512-HHM3nxyUZ3zAylX8ZEyrDNd2XZOnQ0D5XfunJF5FLQnZbHHYq4UWvW1QfelQNXv1ICNkwYhfxjwfnqivYB6bFg=="],
 
     "jest-changed-files/execa": ["execa@5.1.1", "", { "dependencies": { "cross-spawn": "^7.0.3", "get-stream": "^6.0.0", "human-signals": "^2.1.0", "is-stream": "^2.0.0", "merge-stream": "^2.0.0", "npm-run-path": "^4.0.1", "onetime": "^5.1.2", "signal-exit": "^3.0.3", "strip-final-newline": "^2.0.0" } }, "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg=="],
@@ -6275,8 +6267,6 @@
 
     "terser/commander": ["commander@2.20.3", "", {}, "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="],
 
-    "terser-webpack-plugin/@jridgewell/trace-mapping": ["@jridgewell/trace-mapping@0.3.31", "", { "dependencies": { "@jridgewell/resolve-uri": "^3.1.0", "@jridgewell/sourcemap-codec": "^1.4.14" } }, "sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw=="],
-
     "terser-webpack-plugin/schema-utils": ["schema-utils@4.3.3", "", { "dependencies": { "@types/json-schema": "^7.0.9", "ajv": "^8.9.0", "ajv-formats": "^2.1.1", "ajv-keywords": "^5.1.0" } }, "sha512-eflK8wEtyOE6+hsaRVPxvUKYCpRgzLqDTb8krvAsRIwOGlHoSgYLgBXoubGgLd2fT41/OUYdb48v4k4WWHQurA=="],
 
     "test-exclude/glob": ["glob@7.2.3", "", { "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", "inherits": "2", "minimatch": "^3.1.1", "once": "^1.3.0", "path-is-absolute": "^1.0.0" } }, "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q=="],
@@ -6287,7 +6277,9 @@
 
     "through2/readable-stream": ["readable-stream@2.3.8", "", { "dependencies": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", "isarray": "~1.0.0", "process-nextick-args": "~2.0.0", "safe-buffer": "~5.1.1", "string_decoder": "~1.1.1", "util-deprecate": "~1.0.1" } }, "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA=="],
 
-    "ts-loader/source-map": ["source-map@0.7.6", "", {}, "sha512-i5uvt8C3ikiWeNZSVZNWcfZPItFQOsYTUAOkcUPGd8DqDy1uOUikjt5dG+uRlwyvR108Fb9DOd4GvXfT0N2/uQ=="],
+    "tinyglobby/picomatch": ["picomatch@4.0.3", "", {}, "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q=="],
+
+    "ts-loader/source-map": ["source-map@0.7.4", "", {}, "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA=="],
 
     "tsup/tinyexec": ["tinyexec@0.3.2", "", {}, "sha512-KQQR9yN7R5+OSwaK0XQoj22pwHoTlgYqmUscPYoknOoWCWfj/5/ABTMRi69FrKU5ffPVh5QcFikpWJI/P1ocHA=="],
 
@@ -6299,10 +6291,10 @@
 
     "uploadthing/@standard-schema/spec": ["@standard-schema/spec@1.0.0-beta.4", "", {}, "sha512-d3IxtzLo7P1oZ8s8YNvxzBUXRXojSut8pbPrTYtzsc5sn4+53jVqbk66pQerSZbZSJZQux6LkclB/+8IDordHg=="],
 
-    "v8-to-istanbul/@jridgewell/trace-mapping": ["@jridgewell/trace-mapping@0.3.31", "", { "dependencies": { "@jridgewell/resolve-uri": "^3.1.0", "@jridgewell/sourcemap-codec": "^1.4.14" } }, "sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw=="],
-
     "verror/core-util-is": ["core-util-is@1.0.2", "", {}, "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ=="],
 
+    "vite/picomatch": ["picomatch@4.0.3", "", {}, "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q=="],
+
     "vitest/tinyexec": ["tinyexec@0.3.2", "", {}, "sha512-KQQR9yN7R5+OSwaK0XQoj22pwHoTlgYqmUscPYoknOoWCWfj/5/ABTMRi69FrKU5ffPVh5QcFikpWJI/P1ocHA=="],
 
     "webpack/eslint-scope": ["eslint-scope@5.1.1", "", { "dependencies": { "esrecurse": "^4.3.0", "estraverse": "^4.1.1" } }, "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw=="],
@@ -6391,14 +6383,10 @@
 
     "@nestjs/schematics/@angular-devkit/core/ajv": ["ajv@8.17.1", "", { "dependencies": { "fast-deep-equal": "^3.1.3", "fast-uri": "^3.0.1", "json-schema-traverse": "^1.0.0", "require-from-string": "^2.0.2" } }, "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g=="],
 
-    "@nestjs/schematics/@angular-devkit/core/picomatch": ["picomatch@4.0.2", "", {}, "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg=="],
-
     "@nestjs/schematics/@angular-devkit/core/rxjs": ["rxjs@7.8.1", "", { "dependencies": { "tslib": "^2.1.0" } }, "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg=="],
 
     "@nestjs/schematics/@angular-devkit/core/source-map": ["source-map@0.7.4", "", {}, "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA=="],
 
-    "@nestjs/schematics/@angular-devkit/schematics/magic-string": ["magic-string@0.30.17", "", { "dependencies": { "@jridgewell/sourcemap-codec": "^1.5.0" } }, "sha512-sNPKHvyjVf7gyjwS4xGTaW/mCnF8wnjtifKBEhxfZ7E/S8tQ0rssrwGNn6q8JH/ohItJfSQp9mBtQYuTlH5QnA=="],
-
     "@nestjs/schematics/@angular-devkit/schematics/ora": ["ora@5.4.1", "", { "dependencies": { "bl": "^4.1.0", "chalk": "^4.1.0", "cli-cursor": "^3.1.0", "cli-spinners": "^2.5.0", "is-interactive": "^1.0.0", "is-unicode-supported": "^0.1.0", "log-symbols": "^4.1.0", "strip-ansi": "^6.0.0", "wcwidth": "^1.0.1" } }, "sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ=="],
 
     "@nestjs/schematics/@angular-devkit/schematics/rxjs": ["rxjs@7.8.1", "", { "dependencies": { "tslib": "^2.1.0" } }, "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg=="],
@@ -6409,6 +6397,8 @@
 
     "@novu/js/socket.io-client/debug": ["debug@4.3.7", "", { "dependencies": { "ms": "^2.1.3" } }, "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ=="],
 
+    "@playwright/experimental-ct-core/vite/picomatch": ["picomatch@4.0.3", "", {}, "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q=="],
+
     "@radix-ui/react-accordion/@radix-ui/react-collapsible/@radix-ui/react-presence": ["@radix-ui/react-presence@1.1.5", "", { "dependencies": { "@radix-ui/react-compose-refs": "1.1.2", "@radix-ui/react-use-layout-effect": "1.1.1" }, "peerDependencies": { "@types/react": "*", "@types/react-dom": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" }, "optionalPeers": ["@types/react", "@types/react-dom"] }, "sha512-/jfEwNDdQVBCNvjkGit4h6pMOzq8bHkopq458dPt2lMjx+eBQUohZNG9A7DtO/O5ukSbxuaNGXMjHicgwy6rQQ=="],
 
     "@semantic-release/git/execa/get-stream": ["get-stream@6.0.1", "", {}, "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg=="],
diff --git a/packages/db/package.json b/packages/db/package.json
index 5c613f514..76ab37b83 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.8",
+  "version": "1.3.13",
   "dependencies": {
     "@prisma/client": "^6.13.0",
     "dotenv": "^16.4.5"
diff --git a/packages/db/prisma/migrations/20251008175411_add_automations_tables/migration.sql b/packages/db/prisma/migrations/20251008175411_add_automations_tables/migration.sql
new file mode 100644
index 000000000..e96bf18ff
--- /dev/null
+++ b/packages/db/prisma/migrations/20251008175411_add_automations_tables/migration.sql
@@ -0,0 +1,57 @@
+-- CreateEnum
+CREATE TYPE "public"."EvidenceAutomationRunStatus" AS ENUM ('pending', 'running', 'completed', 'failed', 'cancelled');
+
+-- CreateEnum
+CREATE TYPE "public"."EvidenceAutomationTrigger" AS ENUM ('manual', 'scheduled', 'api');
+
+-- CreateTable
+CREATE TABLE "public"."EvidenceAutomationRun" (
+    "id" TEXT NOT NULL DEFAULT generate_prefixed_cuid('ear'::text),
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(3) NOT NULL,
+    "evidenceAutomationId" TEXT NOT NULL,
+    "status" "public"."EvidenceAutomationRunStatus" NOT NULL DEFAULT 'pending',
+    "startedAt" TIMESTAMP(3),
+    "completedAt" TIMESTAMP(3),
+    "success" BOOLEAN,
+    "error" TEXT,
+    "logs" JSONB,
+    "output" JSONB,
+    "triggeredBy" "public"."EvidenceAutomationTrigger" NOT NULL DEFAULT 'scheduled',
+    "runDuration" INTEGER,
+    "taskId" TEXT,
+
+    CONSTRAINT "EvidenceAutomationRun_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateTable
+CREATE TABLE "public"."EvidenceAutomation" (
+    "id" TEXT NOT NULL DEFAULT generate_prefixed_cuid('aut'::text),
+    "name" TEXT NOT NULL,
+    "description" TEXT,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "taskId" TEXT NOT NULL,
+
+    CONSTRAINT "EvidenceAutomation_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateIndex
+CREATE INDEX "EvidenceAutomationRun_evidenceAutomationId_idx" ON "public"."EvidenceAutomationRun"("evidenceAutomationId");
+
+-- CreateIndex
+CREATE INDEX "EvidenceAutomationRun_status_idx" ON "public"."EvidenceAutomationRun"("status");
+
+-- CreateIndex
+CREATE INDEX "EvidenceAutomationRun_createdAt_idx" ON "public"."EvidenceAutomationRun"("createdAt");
+
+-- CreateIndex
+CREATE INDEX "EvidenceAutomation_taskId_idx" ON "public"."EvidenceAutomation"("taskId");
+
+-- AddForeignKey
+ALTER TABLE "public"."EvidenceAutomationRun" ADD CONSTRAINT "EvidenceAutomationRun_evidenceAutomationId_fkey" FOREIGN KEY ("evidenceAutomationId") REFERENCES "public"."EvidenceAutomation"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "public"."EvidenceAutomationRun" ADD CONSTRAINT "EvidenceAutomationRun_taskId_fkey" FOREIGN KEY ("taskId") REFERENCES "public"."Task"("id") ON DELETE SET NULL ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "public"."EvidenceAutomation" ADD CONSTRAINT "EvidenceAutomation_taskId_fkey" FOREIGN KEY ("taskId") REFERENCES "public"."Task"("id") ON DELETE CASCADE ON UPDATE CASCADE;
diff --git a/packages/db/prisma/migrations/20251009193556_add_chat_history/migration.sql b/packages/db/prisma/migrations/20251009193556_add_chat_history/migration.sql
new file mode 100644
index 000000000..7f4e9c5d0
--- /dev/null
+++ b/packages/db/prisma/migrations/20251009193556_add_chat_history/migration.sql
@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "public"."EvidenceAutomation" ADD COLUMN     "chatHistory" TEXT;
diff --git a/packages/db/prisma/migrations/20251010162752_add_automation_versions/migration.sql b/packages/db/prisma/migrations/20251010162752_add_automation_versions/migration.sql
new file mode 100644
index 000000000..9b2bee5a5
--- /dev/null
+++ b/packages/db/prisma/migrations/20251010162752_add_automation_versions/migration.sql
@@ -0,0 +1,25 @@
+-- CreateTable
+CREATE TABLE "public"."EvidenceAutomationVersion" (
+    "id" TEXT NOT NULL DEFAULT generate_prefixed_cuid('eav'::text),
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(3) NOT NULL,
+    "evidenceAutomationId" TEXT NOT NULL,
+    "version" INTEGER NOT NULL,
+    "scriptKey" TEXT NOT NULL,
+    "publishedBy" TEXT,
+    "changelog" TEXT,
+
+    CONSTRAINT "EvidenceAutomationVersion_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateIndex
+CREATE INDEX "EvidenceAutomationVersion_evidenceAutomationId_idx" ON "public"."EvidenceAutomationVersion"("evidenceAutomationId");
+
+-- CreateIndex
+CREATE INDEX "EvidenceAutomationVersion_createdAt_idx" ON "public"."EvidenceAutomationVersion"("createdAt");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "EvidenceAutomationVersion_evidenceAutomationId_version_key" ON "public"."EvidenceAutomationVersion"("evidenceAutomationId", "version");
+
+-- AddForeignKey
+ALTER TABLE "public"."EvidenceAutomationVersion" ADD CONSTRAINT "EvidenceAutomationVersion_evidenceAutomationId_fkey" FOREIGN KEY ("evidenceAutomationId") REFERENCES "public"."EvidenceAutomation"("id") ON DELETE CASCADE ON UPDATE CASCADE;
diff --git a/packages/db/prisma/migrations/20251010174252_add_version_to_automation_runs/migration.sql b/packages/db/prisma/migrations/20251010174252_add_version_to_automation_runs/migration.sql
new file mode 100644
index 000000000..400f6264f
--- /dev/null
+++ b/packages/db/prisma/migrations/20251010174252_add_version_to_automation_runs/migration.sql
@@ -0,0 +1,5 @@
+-- AlterTable
+ALTER TABLE "public"."EvidenceAutomationRun" ADD COLUMN     "version" INTEGER;
+
+-- CreateIndex
+CREATE INDEX "EvidenceAutomationRun_version_idx" ON "public"."EvidenceAutomationRun"("version");
diff --git a/packages/db/prisma/schema/automation-run.prisma b/packages/db/prisma/schema/automation-run.prisma
new file mode 100644
index 000000000..a0d1bb122
--- /dev/null
+++ b/packages/db/prisma/schema/automation-run.prisma
@@ -0,0 +1,46 @@
+model EvidenceAutomationRun {
+    id        String   @id @default(dbgenerated("generate_prefixed_cuid('ear'::text)"))
+    createdAt DateTime @default(now())
+    updatedAt DateTime @updatedAt
+
+    // Relations
+    evidenceAutomationId String
+    evidenceAutomation   EvidenceAutomation @relation(fields: [evidenceAutomationId], references: [id], onDelete: Cascade)
+
+    // Run details
+    status      EvidenceAutomationRunStatus @default(pending)
+    startedAt   DateTime?
+    completedAt DateTime?
+
+    // Results
+    success Boolean?
+    error   String?
+    logs    Json?
+    output  Json?
+
+    // Metadata
+    triggeredBy EvidenceAutomationTrigger @default(scheduled)
+    runDuration Int? // in milliseconds
+    version     Int? // Version number that was executed (null = draft)
+    Task        Task?                     @relation(fields: [taskId], references: [id])
+    taskId      String?
+
+    @@index([evidenceAutomationId])
+    @@index([status])
+    @@index([createdAt])
+    @@index([version])
+}
+
+enum EvidenceAutomationRunStatus {
+    pending
+    running
+    completed
+    failed
+    cancelled
+}
+
+enum EvidenceAutomationTrigger {
+    manual
+    scheduled
+    api
+}
diff --git a/packages/db/prisma/schema/automation-version.prisma b/packages/db/prisma/schema/automation-version.prisma
new file mode 100644
index 000000000..5e8fcd3c0
--- /dev/null
+++ b/packages/db/prisma/schema/automation-version.prisma
@@ -0,0 +1,19 @@
+model EvidenceAutomationVersion {
+    id        String   @id @default(dbgenerated("generate_prefixed_cuid('eav'::text)"))
+    createdAt DateTime @default(now())
+    updatedAt DateTime @updatedAt
+
+    // Relations
+    evidenceAutomationId String
+    evidenceAutomation   EvidenceAutomation @relation(fields: [evidenceAutomationId], references: [id], onDelete: Cascade)
+
+    // Version details
+    version     Int // Sequential version number (1, 2, 3...)
+    scriptKey   String // S3 key for this version's script
+    publishedBy String? // User ID who published
+    changelog   String? // Optional description of changes
+
+    @@unique([evidenceAutomationId, version])
+    @@index([evidenceAutomationId])
+    @@index([createdAt])
+}
diff --git a/packages/db/prisma/schema/automation.prisma b/packages/db/prisma/schema/automation.prisma
new file mode 100644
index 000000000..f1f918042
--- /dev/null
+++ b/packages/db/prisma/schema/automation.prisma
@@ -0,0 +1,17 @@
+model EvidenceAutomation {
+    id          String   @id @default(dbgenerated("generate_prefixed_cuid('aut'::text)"))
+    name        String
+    description String?
+    createdAt   DateTime @default(now())
+
+    chatHistory String?
+
+    taskId String
+    task   Task   @relation(fields: [taskId], references: [id], onDelete: Cascade)
+
+    // Relations
+    runs     EvidenceAutomationRun[]
+    versions EvidenceAutomationVersion[]
+
+    @@index([taskId])
+}
diff --git a/packages/db/prisma/schema/task.prisma b/packages/db/prisma/schema/task.prisma
index ef9e511bf..d8173e7ea 100644
--- a/packages/db/prisma/schema/task.prisma
+++ b/packages/db/prisma/schema/task.prisma
@@ -15,15 +15,18 @@ model Task {
     reviewDate      DateTime?
 
     // Relationships
-    controls       Control[]
-    vendors        Vendor[]
-    risks          Risk[]
-    assigneeId     String?
-    assignee       Member?                      @relation(fields: [assigneeId], references: [id])
-    organizationId String
-    organization   Organization                 @relation(fields: [organizationId], references: [id], onDelete: Cascade)
-    taskTemplateId String?
-    taskTemplate   FrameworkEditorTaskTemplate? @relation(fields: [taskTemplateId], references: [id])
+    assigneeId          String?
+    assignee            Member?                      @relation(fields: [assigneeId], references: [id])
+    organizationId      String
+    organization        Organization                 @relation(fields: [organizationId], references: [id], onDelete: Cascade)
+    taskTemplateId      String?
+    taskTemplate        FrameworkEditorTaskTemplate? @relation(fields: [taskTemplateId], references: [id])
+    controls            Control[]
+    vendors             Vendor[]
+    risks               Risk[]
+    evidenceAutomations EvidenceAutomation[]
+
+    EvidenceAutomationRun EvidenceAutomationRun[]
 }
 
 enum TaskStatus {
diff --git a/packages/docs/openapi.json b/packages/docs/openapi.json
index 31717814d..0b55791a5 100644
--- a/packages/docs/openapi.json
+++ b/packages/docs/openapi.json
@@ -5959,6 +5959,606 @@
         ]
       }
     },
+    "/v1/tasks/{taskId}/automation-runs": {
+      "get": {
+        "description": "Retrieve all evidence automation runs for a specific task",
+        "operationId": "TasksController_getTaskAutomationRuns_v1",
+        "parameters": [
+          {
+            "name": "X-Organization-Id",
+            "in": "header",
+            "description": "Organization ID (required for session auth, optional for API key auth)",
+            "required": false,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "taskId",
+            "required": true,
+            "in": "path",
+            "description": "Task ID",
+            "schema": {
+              "example": "tsk_abc123def456",
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Automation runs retrieved successfully",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "type": "object",
+                    "properties": {
+                      "id": {
+                        "type": "string",
+                        "example": "ear_abc123def456"
+                      },
+                      "status": {
+                        "type": "string",
+                        "enum": [
+                          "PENDING",
+                          "RUNNING",
+                          "COMPLETED",
+                          "FAILED"
+                        ]
+                      },
+                      "trigger": {
+                        "type": "string",
+                        "enum": [
+                          "MANUAL",
+                          "SCHEDULED",
+                          "EVENT"
+                        ]
+                      },
+                      "createdAt": {
+                        "type": "string",
+                        "format": "date-time"
+                      },
+                      "completedAt": {
+                        "type": "string",
+                        "format": "date-time",
+                        "nullable": true
+                      },
+                      "error": {
+                        "type": "object",
+                        "nullable": true
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Unauthorized"
+          },
+          "404": {
+            "description": "Task not found"
+          }
+        },
+        "security": [
+          {
+            "apikey": []
+          }
+        ],
+        "summary": "Get all automation runs for a task",
+        "tags": [
+          "Tasks"
+        ]
+      }
+    },
+    "/v1/tasks/{taskId}/automations": {
+      "get": {
+        "description": "Retrieve all automations for a specific task",
+        "operationId": "AutomationsController_getTaskAutomations_v1",
+        "parameters": [
+          {
+            "name": "X-Organization-Id",
+            "in": "header",
+            "description": "Organization ID (required for session auth, optional for API key auth)",
+            "required": false,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "taskId",
+            "required": true,
+            "in": "path",
+            "description": "Unique task identifier",
+            "schema": {
+              "example": "tsk_abc123def456",
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Automations retrieved successfully"
+          }
+        },
+        "security": [
+          {
+            "apikey": []
+          }
+        ],
+        "summary": "Get all automations for a task",
+        "tags": [
+          "Task Automations"
+        ]
+      },
+      "post": {
+        "description": "Create an automation for collecting evidence for a specific task",
+        "operationId": "AutomationsController_createAutomation_v1",
+        "parameters": [
+          {
+            "name": "X-Organization-Id",
+            "in": "header",
+            "description": "Organization ID (required for session auth, optional for API key auth)",
+            "required": false,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "taskId",
+            "required": true,
+            "in": "path",
+            "description": "Unique task identifier",
+            "schema": {
+              "example": "tsk_abc123def456",
+              "type": "string"
+            }
+          }
+        ],
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/CreateAutomationDto"
+              }
+            }
+          }
+        },
+        "responses": {
+          "201": {
+            "description": "Automation created successfully",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "success": {
+                      "type": "boolean",
+                      "example": true
+                    },
+                    "automation": {
+                      "type": "object",
+                      "properties": {
+                        "id": {
+                          "type": "string",
+                          "example": "auto_abc123def456"
+                        },
+                        "name": {
+                          "type": "string",
+                          "example": "Task Name - Evidence Collection"
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad request - Invalid task ID or organization ID",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "message": {
+                      "type": "string",
+                      "example": "Invalid task ID or organization ID"
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Unauthorized - Invalid authentication",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "message": {
+                      "type": "string",
+                      "example": "Unauthorized"
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Task not found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "message": {
+                      "type": "string",
+                      "example": "Task not found"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        },
+        "security": [
+          {
+            "apikey": []
+          }
+        ],
+        "summary": "Create a new evidence automation",
+        "tags": [
+          "Task Automations"
+        ]
+      }
+    },
+    "/v1/tasks/{taskId}/automations/{automationId}": {
+      "get": {
+        "description": "Retrieve details for a specific automation",
+        "operationId": "AutomationsController_getAutomation_v1",
+        "parameters": [
+          {
+            "name": "X-Organization-Id",
+            "in": "header",
+            "description": "Organization ID (required for session auth, optional for API key auth)",
+            "required": false,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "taskId",
+            "required": true,
+            "in": "path",
+            "description": "Unique task identifier",
+            "schema": {
+              "example": "tsk_abc123def456",
+              "type": "string"
+            }
+          },
+          {
+            "name": "automationId",
+            "required": true,
+            "in": "path",
+            "description": "Unique automation identifier",
+            "schema": {
+              "example": "auto_abc123def456",
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Automation details retrieved successfully"
+          }
+        },
+        "security": [
+          {
+            "apikey": []
+          }
+        ],
+        "summary": "Get automation details",
+        "tags": [
+          "Task Automations"
+        ]
+      },
+      "patch": {
+        "description": "Update the name or description of an existing automation",
+        "operationId": "AutomationsController_updateAutomation_v1",
+        "parameters": [
+          {
+            "name": "X-Organization-Id",
+            "in": "header",
+            "description": "Organization ID (required for session auth, optional for API key auth)",
+            "required": false,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "taskId",
+            "required": true,
+            "in": "path",
+            "description": "Unique task identifier",
+            "schema": {
+              "example": "tsk_abc123def456",
+              "type": "string"
+            }
+          },
+          {
+            "name": "automationId",
+            "required": true,
+            "in": "path",
+            "description": "Unique automation identifier",
+            "schema": {
+              "example": "auto_abc123def456",
+              "type": "string"
+            }
+          }
+        ],
+        "requestBody": {
+          "required": true,
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/UpdateAutomationDto"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Automation updated successfully",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "success": {
+                      "type": "boolean",
+                      "example": true
+                    },
+                    "automation": {
+                      "type": "object",
+                      "properties": {
+                        "id": {
+                          "type": "string",
+                          "example": "auto_abc123def456"
+                        },
+                        "name": {
+                          "type": "string",
+                          "example": "Updated Automation Name"
+                        },
+                        "description": {
+                          "type": "string",
+                          "example": "Updated description"
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Bad request - Invalid automation ID or data",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "message": {
+                      "type": "string",
+                      "example": "Invalid automation data"
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Unauthorized - Invalid authentication",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "message": {
+                      "type": "string",
+                      "example": "Unauthorized"
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Automation not found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "message": {
+                      "type": "string",
+                      "example": "Automation not found"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        },
+        "security": [
+          {
+            "apikey": []
+          }
+        ],
+        "summary": "Update an existing automation",
+        "tags": [
+          "Task Automations"
+        ]
+      },
+      "delete": {
+        "description": "Delete a specific automation and all its associated data",
+        "operationId": "AutomationsController_deleteAutomation_v1",
+        "parameters": [
+          {
+            "name": "X-Organization-Id",
+            "in": "header",
+            "description": "Organization ID (required for session auth, optional for API key auth)",
+            "required": false,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "taskId",
+            "required": true,
+            "in": "path",
+            "description": "Unique task identifier",
+            "schema": {
+              "example": "tsk_abc123def456",
+              "type": "string"
+            }
+          },
+          {
+            "name": "automationId",
+            "required": true,
+            "in": "path",
+            "description": "Unique automation identifier",
+            "schema": {
+              "example": "auto_abc123def456",
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Automation deleted successfully"
+          }
+        },
+        "security": [
+          {
+            "apikey": []
+          }
+        ],
+        "summary": "Delete an automation",
+        "tags": [
+          "Task Automations"
+        ]
+      }
+    },
+    "/v1/tasks/{taskId}/automations/{automationId}/versions": {
+      "get": {
+        "description": "Retrieve all published versions of an automation script",
+        "operationId": "AutomationsController_getAutomationVersions_v1",
+        "parameters": [
+          {
+            "name": "X-Organization-Id",
+            "in": "header",
+            "description": "Organization ID (required for session auth, optional for API key auth)",
+            "required": false,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "taskId",
+            "required": true,
+            "in": "path",
+            "description": "Task ID",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "automationId",
+            "required": true,
+            "in": "path",
+            "description": "Automation ID",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "limit",
+            "required": true,
+            "in": "query",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "offset",
+            "required": true,
+            "in": "query",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Versions retrieved successfully",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "success": {
+                      "type": "boolean"
+                    },
+                    "versions": {
+                      "type": "array",
+                      "items": {
+                        "type": "object",
+                        "properties": {
+                          "id": {
+                            "type": "string"
+                          },
+                          "version": {
+                            "type": "number"
+                          },
+                          "scriptKey": {
+                            "type": "string"
+                          },
+                          "changelog": {
+                            "type": "string",
+                            "nullable": true
+                          },
+                          "publishedBy": {
+                            "type": "string",
+                            "nullable": true
+                          },
+                          "createdAt": {
+                            "type": "string",
+                            "format": "date-time"
+                          }
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        },
+        "security": [
+          {
+            "apikey": []
+          }
+        ],
+        "summary": "Get all versions for an automation",
+        "tags": [
+          "Task Automations"
+        ]
+      }
+    },
     "/v1/comments": {
       "get": {
         "description": "Retrieve all comments for a specific entity (task, policy, vendor, etc.)",
@@ -8264,6 +8864,34 @@
           "fileData"
         ]
       },
+      "CreateAutomationDto": {
+        "type": "object",
+        "properties": {
+          "taskId": {
+            "type": "string",
+            "description": "Task ID",
+            "example": "tsk_abc123def456"
+          }
+        },
+        "required": [
+          "taskId"
+        ]
+      },
+      "UpdateAutomationDto": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string",
+            "description": "Automation name",
+            "example": "GitHub Security Check - Evidence Collection"
+          },
+          "description": {
+            "type": "string",
+            "description": "Automation description",
+            "example": "Collects evidence about GitHub repository security settings"
+          }
+        }
+      },
       "AuthorResponseDto": {
         "type": "object",
         "properties": {

From eabe2854763b7547e79107185e98d03730d75c1a Mon Sep 17 00:00:00 2001
From: Mariano Fuentes <marfuen98@gmail.com>
Date: Tue, 14 Oct 2025 10:48:09 -0400
Subject: [PATCH 02/12] chore: fix api script (#1652)

---
 apps/api/package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/api/package.json b/apps/api/package.json
index 1f905ed8e..bab2566f3 100644
--- a/apps/api/package.json
+++ b/apps/api/package.json
@@ -71,8 +71,8 @@
   "private": true,
   "scripts": {
     "build": "nest build",
-    "build:docker": "prisma generate && nest build",
-    "db:generate": "bun run db:getschema && prisma generate",
+    "build:docker": "bunx prisma generate && nest build",
+    "db:generate": "bun run db:getschema && bunx prisma generate",
     "db:getschema": "node ../../packages/db/scripts/combine-schemas.js && cp ../../packages/db/dist/schema.prisma prisma/schema.prisma",
     "db:migrate": "cd ../../packages/db && bunx prisma migrate dev && cd ../../apps/api",
     "dev": "nest start --watch",

From 9713e467110352e440afd17452519d82fb6a8523 Mon Sep 17 00:00:00 2001
From: Mariano Fuentes <marfuen98@gmail.com>
Date: Tue, 14 Oct 2025 13:22:10 -0400
Subject: [PATCH 03/12] Mariano/fix apis 2 (#1653)

* chore: fix api script

* chore(api): update bun install command to handle installation failures
---
 apps/api/buildspec.yml | 2 +-
 apps/api/package.json  | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/apps/api/buildspec.yml b/apps/api/buildspec.yml
index e6a222549..616cb72e1 100644
--- a/apps/api/buildspec.yml
+++ b/apps/api/buildspec.yml
@@ -29,7 +29,7 @@ phases:
 
       # Install only API workspace dependencies
       - echo "Installing API dependencies only..."
-      - bun install --filter=@comp/api --frozen-lockfile
+      - bun install --filter=@comp/api --frozen-lockfile || bun install --filter=@comp/api --frozen-lockfile --ignore-scripts
 
       # Build NestJS application (prebuild automatically handles Prisma)
       - echo "Building NestJS application..."
diff --git a/apps/api/package.json b/apps/api/package.json
index bab2566f3..75fead8ab 100644
--- a/apps/api/package.json
+++ b/apps/api/package.json
@@ -4,6 +4,8 @@
   "version": "0.0.1",
   "author": "",
   "dependencies": {
+    "@prisma/client": "^6.13.0",
+    "prisma": "^6.13.0",
     "@aws-sdk/client-s3": "^3.859.0",
     "@aws-sdk/s3-request-presigner": "^3.859.0",
     "@nestjs/common": "^11.0.1",

From e731fb5d3df1e2fea386fc830bc83c61a5cde3e5 Mon Sep 17 00:00:00 2001
From: Mariano Fuentes <marfuen98@gmail.com>
Date: Tue, 14 Oct 2025 13:29:07 -0400
Subject: [PATCH 04/12] chore(api): update bun install command to handle
 additional installation failures (#1654)

---
 apps/api/buildspec.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/api/buildspec.yml b/apps/api/buildspec.yml
index 616cb72e1..b0667e19b 100644
--- a/apps/api/buildspec.yml
+++ b/apps/api/buildspec.yml
@@ -29,7 +29,7 @@ phases:
 
       # Install only API workspace dependencies
       - echo "Installing API dependencies only..."
-      - bun install --filter=@comp/api --frozen-lockfile || bun install --filter=@comp/api --frozen-lockfile --ignore-scripts
+      - bun install --filter=@comp/api --frozen-lockfile || bun install --filter=@comp/api --ignore-scripts || bun install --ignore-scripts
 
       # Build NestJS application (prebuild automatically handles Prisma)
       - echo "Building NestJS application..."

From 98ec3eb94f6ae7ebe91d3ace9e7825f6e1e8ed73 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 14 Oct 2025 14:49:11 -0400
Subject: [PATCH 05/12] chore(automation): remove automation controller,
 service, and related DTOs (#1655)

Co-authored-by: Mariano Fuentes <marfuen98@gmail.com>
---
 .../src/automation/automation.controller.ts   |  59 ------
 apps/api/src/automation/automation.module.ts  |  11 --
 apps/api/src/automation/automation.service.ts |  64 -------
 .../dto/automation-error-responses.dto.ts     |  25 ---
 .../dto/automation-responses.dto.ts           |  63 ------
 .../automation/dto/create-automation.dto.ts   |  12 --
 .../automation/dto/update-automation.dto.ts   |  22 ---
 .../schemas/automation-operations.ts          |  11 --
 .../schemas/create-automation.responses.ts    |  71 -------
 .../schemas/update-automation.responses.ts    |  69 -------
 .../automations/automations.controller.ts     |  57 ++++++
 apps/api/src/tasks/tasks.controller.ts        |  68 +------
 .../hooks/use-task-automation-runs.ts         |   2 +-
 packages/docs/openapi.json                    | 180 +++++++++---------
 14 files changed, 146 insertions(+), 568 deletions(-)
 delete mode 100644 apps/api/src/automation/automation.controller.ts
 delete mode 100644 apps/api/src/automation/automation.module.ts
 delete mode 100644 apps/api/src/automation/automation.service.ts
 delete mode 100644 apps/api/src/automation/dto/automation-error-responses.dto.ts
 delete mode 100644 apps/api/src/automation/dto/automation-responses.dto.ts
 delete mode 100644 apps/api/src/automation/dto/create-automation.dto.ts
 delete mode 100644 apps/api/src/automation/dto/update-automation.dto.ts
 delete mode 100644 apps/api/src/automation/schemas/automation-operations.ts
 delete mode 100644 apps/api/src/automation/schemas/create-automation.responses.ts
 delete mode 100644 apps/api/src/automation/schemas/update-automation.responses.ts

diff --git a/apps/api/src/automation/automation.controller.ts b/apps/api/src/automation/automation.controller.ts
deleted file mode 100644
index 26975fc94..000000000
--- a/apps/api/src/automation/automation.controller.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-import {
-  Body,
-  Controller,
-  Param,
-  Patch,
-  Post,
-  UseGuards,
-} from '@nestjs/common';
-import {
-  ApiHeader,
-  ApiOperation,
-  ApiResponse,
-  ApiSecurity,
-  ApiTags,
-} from '@nestjs/swagger';
-import { HybridAuthGuard } from '../auth/hybrid-auth.guard';
-import { AutomationService } from './automation.service';
-import { CreateAutomationDto } from './dto/create-automation.dto';
-import { UpdateAutomationDto } from './dto/update-automation.dto';
-import { AUTOMATION_OPERATIONS } from './schemas/automation-operations';
-import { CREATE_AUTOMATION_RESPONSES } from './schemas/create-automation.responses';
-import { UPDATE_AUTOMATION_RESPONSES } from './schemas/update-automation.responses';
-
-@ApiTags('Automations')
-@Controller({ path: 'automations', version: '1' })
-@UseGuards(HybridAuthGuard)
-@ApiSecurity('apikey')
-@ApiHeader({
-  name: 'X-Organization-Id',
-  description:
-    'Organization ID (required for session auth, optional for API key auth)',
-  required: false,
-})
-export class AutomationController {
-  constructor(private readonly automationService: AutomationService) {}
-
-  @Post()
-  @ApiOperation(AUTOMATION_OPERATIONS.createAutomation)
-  @ApiResponse(CREATE_AUTOMATION_RESPONSES[201])
-  @ApiResponse(CREATE_AUTOMATION_RESPONSES[400])
-  @ApiResponse(CREATE_AUTOMATION_RESPONSES[401])
-  @ApiResponse(CREATE_AUTOMATION_RESPONSES[404])
-  async createAutomation(@Body() createAutomationDto: CreateAutomationDto) {
-    return this.automationService.create(createAutomationDto);
-  }
-
-  @Patch(':automationId')
-  @ApiOperation(AUTOMATION_OPERATIONS.updateAutomation)
-  @ApiResponse(UPDATE_AUTOMATION_RESPONSES[200])
-  @ApiResponse(UPDATE_AUTOMATION_RESPONSES[400])
-  @ApiResponse(UPDATE_AUTOMATION_RESPONSES[401])
-  @ApiResponse(UPDATE_AUTOMATION_RESPONSES[404])
-  async updateAutomation(
-    @Param('automationId') automationId: string,
-    @Body() updateAutomationDto: UpdateAutomationDto,
-  ) {
-    return this.automationService.update(automationId, updateAutomationDto);
-  }
-}
diff --git a/apps/api/src/automation/automation.module.ts b/apps/api/src/automation/automation.module.ts
deleted file mode 100644
index 14d470d6d..000000000
--- a/apps/api/src/automation/automation.module.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { Module } from '@nestjs/common';
-import { AuthModule } from '../auth/auth.module';
-import { AutomationController } from './automation.controller';
-import { AutomationService } from './automation.service';
-
-@Module({
-  imports: [AuthModule],
-  controllers: [AutomationController],
-  providers: [AutomationService],
-})
-export class AutomationModule {}
diff --git a/apps/api/src/automation/automation.service.ts b/apps/api/src/automation/automation.service.ts
deleted file mode 100644
index e07ea953a..000000000
--- a/apps/api/src/automation/automation.service.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-import { Injectable, NotFoundException } from '@nestjs/common';
-import { db } from '@trycompai/db';
-import { CreateAutomationDto } from './dto/create-automation.dto';
-import { UpdateAutomationDto } from './dto/update-automation.dto';
-
-@Injectable()
-export class AutomationService {
-  async create(createAutomationDto: CreateAutomationDto) {
-    const { taskId } = createAutomationDto;
-
-    const task = await db.task.findFirst({
-      where: {
-        id: taskId,
-      },
-    });
-
-    if (!task) {
-      throw new NotFoundException('Task not found');
-    }
-
-    const automation = await db.evidenceAutomation.create({
-      data: {
-        name: `${task.title} - AI Automation`,
-        taskId: taskId,
-      },
-    });
-
-    return {
-      success: true,
-      automation: {
-        id: automation.id,
-        name: automation.name,
-      },
-    };
-  }
-
-  async update(automationId: string, updateAutomationDto: UpdateAutomationDto) {
-    const existingAutomation = await db.evidenceAutomation.findFirst({
-      where: {
-        id: automationId,
-      },
-    });
-
-    if (!existingAutomation) {
-      throw new NotFoundException('Automation not found');
-    }
-
-    const automation = await db.evidenceAutomation.update({
-      where: {
-        id: automationId,
-      },
-      data: updateAutomationDto,
-    });
-
-    return {
-      success: true,
-      automation: {
-        id: automation.id,
-        name: automation.name,
-        description: automation.description,
-      },
-    };
-  }
-}
diff --git a/apps/api/src/automation/dto/automation-error-responses.dto.ts b/apps/api/src/automation/dto/automation-error-responses.dto.ts
deleted file mode 100644
index 57c394af9..000000000
--- a/apps/api/src/automation/dto/automation-error-responses.dto.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { ApiProperty } from '@nestjs/swagger';
-
-export class BadRequestResponseDto {
-  @ApiProperty({
-    description: 'Error message',
-    example: 'Invalid task ID or organization ID',
-  })
-  message: string;
-}
-
-export class UnauthorizedResponseDto {
-  @ApiProperty({
-    description: 'Error message',
-    example: 'Unauthorized',
-  })
-  message: string;
-}
-
-export class TaskNotFoundResponseDto {
-  @ApiProperty({
-    description: 'Error message',
-    example: 'Task not found',
-  })
-  message: string;
-}
diff --git a/apps/api/src/automation/dto/automation-responses.dto.ts b/apps/api/src/automation/dto/automation-responses.dto.ts
deleted file mode 100644
index 8c5106ea1..000000000
--- a/apps/api/src/automation/dto/automation-responses.dto.ts
+++ /dev/null
@@ -1,63 +0,0 @@
-import { ApiProperty } from '@nestjs/swagger';
-
-export class AutomationResponseDto {
-  @ApiProperty({
-    description: 'Automation ID',
-    example: 'auto_abc123def456',
-  })
-  id: string;
-
-  @ApiProperty({
-    description: 'Automation name',
-    example: 'Task Name - Evidence Collection',
-  })
-  name: string;
-
-  @ApiProperty({
-    description: 'Task ID this automation belongs to',
-    example: 'tsk_abc123def456',
-  })
-  taskId: string;
-
-  @ApiProperty({
-    description: 'Organization ID',
-    example: 'org_abc123def456',
-  })
-  organizationId: string;
-
-  @ApiProperty({
-    description: 'Automation status',
-    example: 'active',
-    enum: ['active', 'inactive', 'draft'],
-  })
-  status: string;
-
-  @ApiProperty({
-    description: 'Creation timestamp',
-    example: '2024-01-15T10:30:00Z',
-  })
-  createdAt: Date;
-
-  @ApiProperty({
-    description: 'Last update timestamp',
-    example: '2024-01-15T10:30:00Z',
-  })
-  updatedAt: Date;
-}
-
-export class CreateAutomationResponseDto {
-  @ApiProperty({
-    description: 'Success status',
-    example: true,
-  })
-  success: boolean;
-
-  @ApiProperty({
-    description: 'Created automation details',
-    type: () => AutomationResponseDto,
-  })
-  automation: {
-    id: string;
-    name: string;
-  };
-}
diff --git a/apps/api/src/automation/dto/create-automation.dto.ts b/apps/api/src/automation/dto/create-automation.dto.ts
deleted file mode 100644
index 3a75723f3..000000000
--- a/apps/api/src/automation/dto/create-automation.dto.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { ApiProperty } from '@nestjs/swagger';
-import { IsString, IsNotEmpty } from 'class-validator';
-
-export class CreateAutomationDto {
-  @ApiProperty({
-    description: 'Task ID',
-    example: 'tsk_abc123def456',
-  })
-  @IsString()
-  @IsNotEmpty()
-  taskId: string;
-}
diff --git a/apps/api/src/automation/dto/update-automation.dto.ts b/apps/api/src/automation/dto/update-automation.dto.ts
deleted file mode 100644
index 9890f98d3..000000000
--- a/apps/api/src/automation/dto/update-automation.dto.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import { ApiProperty } from '@nestjs/swagger';
-import { IsString, IsOptional } from 'class-validator';
-
-export class UpdateAutomationDto {
-  @ApiProperty({
-    description: 'Automation name',
-    example: 'GitHub Security Check - Evidence Collection',
-    required: false,
-  })
-  @IsString()
-  @IsOptional()
-  name?: string;
-
-  @ApiProperty({
-    description: 'Automation description',
-    example: 'Collects evidence about GitHub repository security settings',
-    required: false,
-  })
-  @IsString()
-  @IsOptional()
-  description?: string;
-}
diff --git a/apps/api/src/automation/schemas/automation-operations.ts b/apps/api/src/automation/schemas/automation-operations.ts
deleted file mode 100644
index b5d9056fb..000000000
--- a/apps/api/src/automation/schemas/automation-operations.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-export const AUTOMATION_OPERATIONS = {
-  createAutomation: {
-    summary: 'Create a new evidence automation',
-    description:
-      'Create an automation for collecting evidence for a specific task',
-  },
-  updateAutomation: {
-    summary: 'Update an existing automation',
-    description: 'Update the name or description of an existing automation',
-  },
-};
diff --git a/apps/api/src/automation/schemas/create-automation.responses.ts b/apps/api/src/automation/schemas/create-automation.responses.ts
deleted file mode 100644
index 5b60ccd75..000000000
--- a/apps/api/src/automation/schemas/create-automation.responses.ts
+++ /dev/null
@@ -1,71 +0,0 @@
-export const CREATE_AUTOMATION_RESPONSES = {
-  201: {
-    status: 201,
-    description: 'Automation created successfully',
-    content: {
-      'application/json': {
-        schema: {
-          type: 'object',
-          properties: {
-            success: { type: 'boolean', example: true },
-            automation: {
-              type: 'object',
-              properties: {
-                id: { type: 'string', example: 'auto_abc123def456' },
-                name: {
-                  type: 'string',
-                  example: 'Task Name - Evidence Collection',
-                },
-              },
-            },
-          },
-        },
-      },
-    },
-  },
-  400: {
-    status: 400,
-    description: 'Bad request - Invalid task ID or organization ID',
-    content: {
-      'application/json': {
-        schema: {
-          type: 'object',
-          properties: {
-            message: {
-              type: 'string',
-              example: 'Invalid task ID or organization ID',
-            },
-          },
-        },
-      },
-    },
-  },
-  401: {
-    status: 401,
-    description: 'Unauthorized - Invalid authentication',
-    content: {
-      'application/json': {
-        schema: {
-          type: 'object',
-          properties: {
-            message: { type: 'string', example: 'Unauthorized' },
-          },
-        },
-      },
-    },
-  },
-  404: {
-    status: 404,
-    description: 'Task not found',
-    content: {
-      'application/json': {
-        schema: {
-          type: 'object',
-          properties: {
-            message: { type: 'string', example: 'Task not found' },
-          },
-        },
-      },
-    },
-  },
-};
diff --git a/apps/api/src/automation/schemas/update-automation.responses.ts b/apps/api/src/automation/schemas/update-automation.responses.ts
deleted file mode 100644
index 8a8a5ec71..000000000
--- a/apps/api/src/automation/schemas/update-automation.responses.ts
+++ /dev/null
@@ -1,69 +0,0 @@
-export const UPDATE_AUTOMATION_RESPONSES = {
-  200: {
-    status: 200,
-    description: 'Automation updated successfully',
-    content: {
-      'application/json': {
-        schema: {
-          type: 'object',
-          properties: {
-            success: { type: 'boolean', example: true },
-            automation: {
-              type: 'object',
-              properties: {
-                id: { type: 'string', example: 'auto_abc123def456' },
-                name: { type: 'string', example: 'Updated Automation Name' },
-                description: { type: 'string', example: 'Updated description' },
-              },
-            },
-          },
-        },
-      },
-    },
-  },
-  400: {
-    status: 400,
-    description: 'Bad request - Invalid automation ID or data',
-    content: {
-      'application/json': {
-        schema: {
-          type: 'object',
-          properties: {
-            message: {
-              type: 'string',
-              example: 'Invalid automation data',
-            },
-          },
-        },
-      },
-    },
-  },
-  401: {
-    status: 401,
-    description: 'Unauthorized - Invalid authentication',
-    content: {
-      'application/json': {
-        schema: {
-          type: 'object',
-          properties: {
-            message: { type: 'string', example: 'Unauthorized' },
-          },
-        },
-      },
-    },
-  },
-  404: {
-    status: 404,
-    description: 'Automation not found',
-    content: {
-      'application/json': {
-        schema: {
-          type: 'object',
-          properties: {
-            message: { type: 'string', example: 'Automation not found' },
-          },
-        },
-      },
-    },
-  },
-};
diff --git a/apps/api/src/tasks/automations/automations.controller.ts b/apps/api/src/tasks/automations/automations.controller.ts
index f22b08805..74311c8f4 100644
--- a/apps/api/src/tasks/automations/automations.controller.ts
+++ b/apps/api/src/tasks/automations/automations.controller.ts
@@ -230,4 +230,61 @@ export class AutomationsController {
       parsedOffset,
     );
   }
+
+  // ==================== AUTOMATION RUNS (per task) ====================
+
+  @Get('runs')
+  @ApiOperation({
+    summary: 'Get all automation runs for a task',
+    description:
+      'Retrieve all evidence automation runs across automations for a specific task',
+  })
+  @ApiParam({
+    name: 'taskId',
+    description: 'Task ID',
+    example: 'tsk_abc123def456',
+  })
+  @ApiResponse({
+    status: 200,
+    description: 'Automation runs retrieved successfully',
+    content: {
+      'application/json': {
+        schema: {
+          type: 'array',
+          items: {
+            type: 'object',
+            properties: {
+              id: { type: 'string', example: 'ear_abc123def456' },
+              status: {
+                type: 'string',
+                enum: ['PENDING', 'RUNNING', 'COMPLETED', 'FAILED'],
+              },
+              trigger: {
+                type: 'string',
+                enum: ['MANUAL', 'SCHEDULED', 'EVENT'],
+              },
+              createdAt: { type: 'string', format: 'date-time' },
+              completedAt: {
+                type: 'string',
+                format: 'date-time',
+                nullable: true,
+              },
+              error: { type: 'object', nullable: true },
+            },
+          },
+        },
+      },
+    },
+  })
+  async getTaskAutomationRuns(
+    @OrganizationId() organizationId: string,
+    @Param('taskId') taskId: string,
+  ) {
+    // Verify task access first
+    await this.tasksService.verifyTaskAccess(organizationId, taskId);
+    return await this.tasksService.getTaskAutomationRuns(
+      organizationId,
+      taskId,
+    );
+  }
 }
diff --git a/apps/api/src/tasks/tasks.controller.ts b/apps/api/src/tasks/tasks.controller.ts
index 7632a0b7f..cde966a7d 100644
--- a/apps/api/src/tasks/tasks.controller.ts
+++ b/apps/api/src/tasks/tasks.controller.ts
@@ -5,22 +5,18 @@ import {
   Controller,
   Delete,
   Get,
-  HttpCode,
-  HttpStatus,
   Param,
-  Patch,
   Post,
   UseGuards,
 } from '@nestjs/common';
 import {
+  ApiExtraModels,
   ApiHeader,
   ApiOperation,
   ApiParam,
   ApiResponse,
-  ApiNoContentResponse,
   ApiSecurity,
   ApiTags,
-  ApiExtraModels,
 } from '@nestjs/swagger';
 import { AttachmentsService } from '../attachments/attachments.service';
 import { UploadAttachmentDto } from '../attachments/upload-attachment.dto';
@@ -497,66 +493,4 @@ export class TasksController {
       message: 'Attachment deleted successfully',
     };
   }
-
-  // ==================== AUTOMATION RUNS ====================
-
-  @Get(':taskId/automation-runs')
-  @ApiOperation({
-    summary: 'Get all automation runs for a task',
-    description: 'Retrieve all evidence automation runs for a specific task',
-  })
-  @ApiParam({
-    name: 'taskId',
-    description: 'Task ID',
-    example: 'tsk_abc123def456',
-  })
-  @ApiResponse({
-    status: 200,
-    description: 'Automation runs retrieved successfully',
-    content: {
-      'application/json': {
-        schema: {
-          type: 'array',
-          items: {
-            type: 'object',
-            properties: {
-              id: { type: 'string', example: 'ear_abc123def456' },
-              status: {
-                type: 'string',
-                enum: ['PENDING', 'RUNNING', 'COMPLETED', 'FAILED'],
-              },
-              trigger: {
-                type: 'string',
-                enum: ['MANUAL', 'SCHEDULED', 'EVENT'],
-              },
-              createdAt: { type: 'string', format: 'date-time' },
-              completedAt: {
-                type: 'string',
-                format: 'date-time',
-                nullable: true,
-              },
-              error: { type: 'object', nullable: true },
-            },
-          },
-        },
-      },
-    },
-  })
-  @ApiResponse({
-    status: 401,
-    description: 'Unauthorized',
-  })
-  @ApiResponse({
-    status: 404,
-    description: 'Task not found',
-  })
-  async getTaskAutomationRuns(
-    @OrganizationId() organizationId: string,
-    @Param('taskId') taskId: string,
-  ) {
-    return await this.tasksService.getTaskAutomationRuns(
-      organizationId,
-      taskId,
-    );
-  }
 }
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/hooks/use-task-automation-runs.ts b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/hooks/use-task-automation-runs.ts
index e9079486f..3b387ed5f 100644
--- a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/hooks/use-task-automation-runs.ts
+++ b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/hooks/use-task-automation-runs.ts
@@ -33,7 +33,7 @@ export function useTaskAutomationRuns({
     [`task-automation-runs-${taskId}`, orgId, taskId],
     async () => {
       const response = await api.get<AutomationRunWithName[]>(
-        `/v1/tasks/${taskId}/automation-runs`,
+        `/v1/tasks/${taskId}/automations/runs`,
         orgId,
       );
 
diff --git a/packages/docs/openapi.json b/packages/docs/openapi.json
index 0b55791a5..1d22037fc 100644
--- a/packages/docs/openapi.json
+++ b/packages/docs/openapi.json
@@ -5959,99 +5959,6 @@
         ]
       }
     },
-    "/v1/tasks/{taskId}/automation-runs": {
-      "get": {
-        "description": "Retrieve all evidence automation runs for a specific task",
-        "operationId": "TasksController_getTaskAutomationRuns_v1",
-        "parameters": [
-          {
-            "name": "X-Organization-Id",
-            "in": "header",
-            "description": "Organization ID (required for session auth, optional for API key auth)",
-            "required": false,
-            "schema": {
-              "type": "string"
-            }
-          },
-          {
-            "name": "taskId",
-            "required": true,
-            "in": "path",
-            "description": "Task ID",
-            "schema": {
-              "example": "tsk_abc123def456",
-              "type": "string"
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "Automation runs retrieved successfully",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "type": "array",
-                  "items": {
-                    "type": "object",
-                    "properties": {
-                      "id": {
-                        "type": "string",
-                        "example": "ear_abc123def456"
-                      },
-                      "status": {
-                        "type": "string",
-                        "enum": [
-                          "PENDING",
-                          "RUNNING",
-                          "COMPLETED",
-                          "FAILED"
-                        ]
-                      },
-                      "trigger": {
-                        "type": "string",
-                        "enum": [
-                          "MANUAL",
-                          "SCHEDULED",
-                          "EVENT"
-                        ]
-                      },
-                      "createdAt": {
-                        "type": "string",
-                        "format": "date-time"
-                      },
-                      "completedAt": {
-                        "type": "string",
-                        "format": "date-time",
-                        "nullable": true
-                      },
-                      "error": {
-                        "type": "object",
-                        "nullable": true
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          },
-          "401": {
-            "description": "Unauthorized"
-          },
-          "404": {
-            "description": "Task not found"
-          }
-        },
-        "security": [
-          {
-            "apikey": []
-          }
-        ],
-        "summary": "Get all automation runs for a task",
-        "tags": [
-          "Tasks"
-        ]
-      }
-    },
     "/v1/tasks/{taskId}/automations": {
       "get": {
         "description": "Retrieve all automations for a specific task",
@@ -6559,6 +6466,93 @@
         ]
       }
     },
+    "/v1/tasks/{taskId}/automations/runs": {
+      "get": {
+        "description": "Retrieve all evidence automation runs across automations for a specific task",
+        "operationId": "AutomationsController_getTaskAutomationRuns_v1",
+        "parameters": [
+          {
+            "name": "X-Organization-Id",
+            "in": "header",
+            "description": "Organization ID (required for session auth, optional for API key auth)",
+            "required": false,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "taskId",
+            "required": true,
+            "in": "path",
+            "description": "Task ID",
+            "schema": {
+              "example": "tsk_abc123def456",
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Automation runs retrieved successfully",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "type": "object",
+                    "properties": {
+                      "id": {
+                        "type": "string",
+                        "example": "ear_abc123def456"
+                      },
+                      "status": {
+                        "type": "string",
+                        "enum": [
+                          "PENDING",
+                          "RUNNING",
+                          "COMPLETED",
+                          "FAILED"
+                        ]
+                      },
+                      "trigger": {
+                        "type": "string",
+                        "enum": [
+                          "MANUAL",
+                          "SCHEDULED",
+                          "EVENT"
+                        ]
+                      },
+                      "createdAt": {
+                        "type": "string",
+                        "format": "date-time"
+                      },
+                      "completedAt": {
+                        "type": "string",
+                        "format": "date-time",
+                        "nullable": true
+                      },
+                      "error": {
+                        "type": "object",
+                        "nullable": true
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        },
+        "security": [
+          {
+            "apikey": []
+          }
+        ],
+        "summary": "Get all automation runs for a task",
+        "tags": [
+          "Task Automations"
+        ]
+      }
+    },
     "/v1/comments": {
       "get": {
         "description": "Retrieve all comments for a specific entity (task, policy, vendor, etc.)",

From 0188c9a86941e11cebd9b9361e95d5a8e4e6f371 Mon Sep 17 00:00:00 2001
From: Mariano Fuentes <marfuen98@gmail.com>
Date: Tue, 14 Oct 2025 16:14:05 -0400
Subject: [PATCH 06/12] Mariano/api fix 2 (#1656)

* chore(api): update Dockerfile to install production dependencies inside image
---
 apps/api/Dockerfile    | 20 +++++++++++++-------
 apps/api/buildspec.yml |  3 +--
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/apps/api/Dockerfile b/apps/api/Dockerfile
index a66077e63..88369fd2e 100644
--- a/apps/api/Dockerfile
+++ b/apps/api/Dockerfile
@@ -1,12 +1,20 @@
 # Use Node.js runtime for production
 FROM node:20-alpine
 
-# Install wget for health check
-RUN apk add --no-cache wget
+# Install required packages (wget for healthcheck, curl/bash for bun install, libc compat for prisma)
+RUN apk add --no-cache wget curl bash libc6-compat openssl
 
 WORKDIR /app
 
-# Copy the entire pre-built bundle (no dependencies needed)
+# Copy manifests first and install production deps inside the image (avoid broken bun symlinks)
+COPY package.json bun.lock ./
+
+# Install bun and deps
+RUN curl -fsSL https://bun.sh/install | bash \
+  && export PATH="/root/.bun/bin:$PATH" \
+  && bun install --production --frozen-lockfile --ignore-scripts
+
+# Now copy the pre-built app contents (dist/, prisma/, etc.)
 COPY . .
 
 # Set environment variables
@@ -14,10 +22,8 @@ ENV NODE_ENV=production
 ENV PORT=3333
 
 # Create a non-root user for security
-RUN addgroup --system nestjs && adduser --system --ingroup nestjs nestjs
-
-# Change ownership to nestjs user
-RUN chown -R nestjs:nestjs /app
+RUN addgroup --system nestjs && adduser --system --ingroup nestjs nestjs \
+  && chown -R nestjs:nestjs /app
 
 USER nestjs
 
diff --git a/apps/api/buildspec.yml b/apps/api/buildspec.yml
index b0667e19b..e940edcfc 100644
--- a/apps/api/buildspec.yml
+++ b/apps/api/buildspec.yml
@@ -66,8 +66,7 @@ phases:
       - '[ -f "../docker-build/src/main.js" ] || { echo "❌ main.js not found in docker-build/src"; exit 1; }'
 
       # Copy entire node_modules for runtime (includes @trycompai/db from npm)
-      - echo "Bundling all runtime dependencies..."
-      - cp -r ../../node_modules ../docker-build/
+      - echo "Skipping host node_modules copy; Dockerfile installs prod deps inside image"
 
       # Copy Dockerfile
       - echo "Copying Dockerfile..."

From cca4c8cf195cb64983bff53e65884d44b0380864 Mon Sep 17 00:00:00 2001
From: Mariano Fuentes <marfuen98@gmail.com>
Date: Tue, 14 Oct 2025 16:19:22 -0400
Subject: [PATCH 07/12] chore(api): copy package manifests for Docker image
 installation (#1657)

---
 apps/api/buildspec.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/apps/api/buildspec.yml b/apps/api/buildspec.yml
index e940edcfc..d6809fe8a 100644
--- a/apps/api/buildspec.yml
+++ b/apps/api/buildspec.yml
@@ -71,6 +71,9 @@ phases:
       # Copy Dockerfile
       - echo "Copying Dockerfile..."
       - cp Dockerfile ../docker-build/
+      - echo "Copying package manifests for image install..."
+      - cp package.json ../docker-build/
+      - cp ../../bun.lock ../docker-build/ || true
 
       # Build Docker image
       - echo "Building Docker image..."

From 95163873e5b6ff8679935aeb9f5d1dd6d1a6a7b2 Mon Sep 17 00:00:00 2001
From: Mariano Fuentes <marfuen98@gmail.com>
Date: Tue, 14 Oct 2025 16:23:29 -0400
Subject: [PATCH 08/12] chore(api): add prisma client and update bun install
 command (#1658)

---
 apps/api/Dockerfile | 2 +-
 bun.lock            | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/apps/api/Dockerfile b/apps/api/Dockerfile
index 88369fd2e..7119eb8fc 100644
--- a/apps/api/Dockerfile
+++ b/apps/api/Dockerfile
@@ -12,7 +12,7 @@ COPY package.json bun.lock ./
 # Install bun and deps
 RUN curl -fsSL https://bun.sh/install | bash \
   && export PATH="/root/.bun/bin:$PATH" \
-  && bun install --production --frozen-lockfile --ignore-scripts
+  && (bun install --production --frozen-lockfile --ignore-scripts || bun install --production --ignore-scripts)
 
 # Now copy the pre-built app contents (dist/, prisma/, etc.)
 COPY . .
diff --git a/bun.lock b/bun.lock
index 65df7c4ae..c1e4a88d3 100644
--- a/bun.lock
+++ b/bun.lock
@@ -71,6 +71,7 @@
         "@nestjs/core": "^11.0.1",
         "@nestjs/platform-express": "^11.1.5",
         "@nestjs/swagger": "^11.2.0",
+        "@prisma/client": "^6.13.0",
         "@trycompai/db": "^1.3.7",
         "archiver": "^7.0.1",
         "axios": "^1.12.2",
@@ -78,6 +79,7 @@
         "class-transformer": "^0.5.1",
         "class-validator": "^0.14.2",
         "jose": "^6.0.12",
+        "prisma": "^6.13.0",
         "reflect-metadata": "^0.2.2",
         "rxjs": "^7.8.1",
         "swagger-ui-express": "^5.0.1",

From 298662ced6e74763fe043d7a3e7a075e6ae7255e Mon Sep 17 00:00:00 2001
From: Mariano Fuentes <marfuen98@gmail.com>
Date: Tue, 14 Oct 2025 16:35:33 -0400
Subject: [PATCH 09/12] chore(api): generate Prisma client during Docker image
 build (#1659)

---
 apps/api/Dockerfile | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/apps/api/Dockerfile b/apps/api/Dockerfile
index 7119eb8fc..730c7f9df 100644
--- a/apps/api/Dockerfile
+++ b/apps/api/Dockerfile
@@ -7,16 +7,20 @@ RUN apk add --no-cache wget curl bash libc6-compat openssl
 WORKDIR /app
 
 # Copy manifests first and install production deps inside the image (avoid broken bun symlinks)
-COPY package.json bun.lock ./
+COPY package.json ./
 
 # Install bun and deps
 RUN curl -fsSL https://bun.sh/install | bash \
   && export PATH="/root/.bun/bin:$PATH" \
-  && (bun install --production --frozen-lockfile --ignore-scripts || bun install --production --ignore-scripts)
+  && bun install --production --ignore-scripts
 
 # Now copy the pre-built app contents (dist/, prisma/, etc.)
 COPY . .
 
+# Generate Prisma client inside the image (ensures runtime client matches installed deps)
+RUN export PATH="/root/.bun/bin:$PATH" \
+  && bunx prisma generate
+
 # Set environment variables
 ENV NODE_ENV=production
 ENV PORT=3333

From 9ff902b12a08f6ef8d5fc5342afc7d6da484ed9f Mon Sep 17 00:00:00 2001
From: Mariano Fuentes <marfuen98@gmail.com>
Date: Tue, 14 Oct 2025 16:39:19 -0400
Subject: [PATCH 10/12] Mariano/api fix 6 (#1660)

* chore(api): generate Prisma client during Docker image build

* chore(api): update Dockerfile to set BUN_INSTALL environment variable
---
 apps/api/Dockerfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/api/Dockerfile b/apps/api/Dockerfile
index 730c7f9df..7885c2403 100644
--- a/apps/api/Dockerfile
+++ b/apps/api/Dockerfile
@@ -18,7 +18,8 @@ RUN curl -fsSL https://bun.sh/install | bash \
 COPY . .
 
 # Generate Prisma client inside the image (ensures runtime client matches installed deps)
-RUN export PATH="/root/.bun/bin:$PATH" \
+RUN export BUN_INSTALL="/root/.bun" \
+  && export PATH="$BUN_INSTALL/bin:$PATH" \
   && bunx prisma generate
 
 # Set environment variables

From 09adcf6dd42571bbe1d76729080a19568fef22f6 Mon Sep 17 00:00:00 2001
From: Mariano Fuentes <marfuen98@gmail.com>
Date: Tue, 14 Oct 2025 16:43:34 -0400
Subject: [PATCH 11/12] Mariano/api fix 7 (#1661)

* chore(api): replace bunx with npx for Prisma client generation
---
 apps/api/Dockerfile | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/apps/api/Dockerfile b/apps/api/Dockerfile
index 7885c2403..10d59af5b 100644
--- a/apps/api/Dockerfile
+++ b/apps/api/Dockerfile
@@ -18,9 +18,7 @@ RUN curl -fsSL https://bun.sh/install | bash \
 COPY . .
 
 # Generate Prisma client inside the image (ensures runtime client matches installed deps)
-RUN export BUN_INSTALL="/root/.bun" \
-  && export PATH="$BUN_INSTALL/bin:$PATH" \
-  && bunx prisma generate
+RUN npx prisma generate
 
 # Set environment variables
 ENV NODE_ENV=production

From e5a74e5cc52f6c40512010cc5aa66916aa7ec08c Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 14 Oct 2025 18:37:43 -0400
Subject: [PATCH 12/12] [dev] [Marfuen] mariano/quick-fixes (#1662)

* fix(automation): handle undefined createdAt in automation overview

* fix(chat): adjust padding in EmptyState and remove console log in AutomationOverview

* fix(automation): improve ephemeral state handling and update automation ID usage

* chore(automation): add success callback to automation settings dialogs

* fix(automation): update automation ID handling and improve message deduplication

---------

Co-authored-by: Mariano Fuentes <marfuen98@gmail.com>
---
 .../actions/task-automation-actions.ts        |   2 +-
 .../automation/[automationId]/chat.tsx        |  14 ++-
 .../components/AutomationSettingsDialogs.tsx  |  29 +++--
 .../components/PublishDialog.tsx              |  11 +-
 .../components/chat/EmptyState.tsx            |   4 +-
 .../chat/message-part/reasoning.tsx           |   6 +-
 .../components/chat/message.tsx               |   4 +-
 .../components/UnifiedWorkflowCard.tsx        |   7 +-
 .../workflow/workflow-visualizer-simple.tsx   |  20 +++-
 .../automation/[automationId]/hooks/index.ts  |   1 +
 .../[automationId]/hooks/use-chat-handlers.ts |   3 +
 .../hooks/use-task-automation-execution.ts    |  11 +-
 .../[automationId]/lib/chat-context.tsx       |  23 ++--
 .../automation/[automationId]/page.tsx        |  10 +-
 .../components/AutomationOverview.tsx         | 102 ++++++++++++++----
 apps/app/src/styles/globals.css               |  25 +++++
 16 files changed, 212 insertions(+), 60 deletions(-)

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 4b7d4955a..fa89f92ef 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
@@ -193,7 +193,7 @@ export async function executeAutomationScript(data: {
       body: data,
     });
 
-    await revalidateCurrentPath();
+    // Don't revalidate - causes page refresh. Test results are handled via polling/state.
     return { success: true, data: result };
   } catch (error) {
     const typedError = error as EnterpriseApiError;
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 42f804142..bb7d5597a 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
@@ -31,7 +31,7 @@ interface Props {
 
 export function Chat({ className, orgId, taskId, taskName, automationId }: Props) {
   const [input, setInput] = useState('');
-  const { chat, updateAutomationId } = useSharedChatContext();
+  const { chat, updateAutomationId, automationIdRef } = useSharedChatContext();
   const { messages, sendMessage, status } = useChat<ChatUIMessage>({
     chat,
   });
@@ -39,15 +39,21 @@ export function Chat({ className, orgId, taskId, taskName, automationId }: Props
   const inputRef = useRef<HTMLInputElement | null>(null);
   const { automation } = useTaskAutomation();
 
+  // Update shared ref when automation is loaded from hook
+  if (automation?.id && automationIdRef.current === 'new') {
+    automationIdRef.current = automation.id;
+  }
+
   // Ephemeral mode - automation not created yet
-  const isEphemeral = automationId === 'new';
+  // Check the shared ref, not the URL param
+  const isEphemeral = automationIdRef.current === 'new';
 
   const { validateAndSubmitMessage, handleSecretAdded, handleInfoProvided } = useChatHandlers({
     sendMessage,
     setInput,
     orgId,
     taskId,
-    automationId,
+    automationId: automationIdRef.current,
     isEphemeral,
     updateAutomationId,
   });
@@ -85,7 +91,7 @@ export function Chat({ className, orgId, taskId, taskName, automationId }: Props
             orgId={orgId}
             taskId={taskId}
             taskName={taskName}
-            automationId={automationId}
+            automationId={automationIdRef.current}
             automationName={automation?.name}
             isEphemeral={isEphemeral}
           />
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/AutomationSettingsDialogs.tsx b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/AutomationSettingsDialogs.tsx
index f516f4c34..c05bdd91c 100644
--- a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/AutomationSettingsDialogs.tsx
+++ b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/AutomationSettingsDialogs.tsx
@@ -21,25 +21,32 @@ import { useTaskAutomation } from '../hooks/use-task-automation';
 interface EditNameDialogProps {
   open: boolean;
   onOpenChange: (open: boolean) => void;
+  onSuccess?: () => void;
 }
 
 interface EditDescriptionDialogProps {
   open: boolean;
   onOpenChange: (open: boolean) => void;
+  onSuccess?: () => void;
 }
 
 interface DeleteDialogProps {
   open: boolean;
   onOpenChange: (open: boolean) => void;
+  onSuccess?: () => void;
 }
 
-export function EditNameDialog({ open, onOpenChange }: EditNameDialogProps) {
-  const { automation, mutate } = useTaskAutomation();
+export function EditNameDialog({ open, onOpenChange, onSuccess }: EditNameDialogProps) {
+  const { automation, mutate: mutateLocal } = useTaskAutomation();
   const { orgId, taskId, automationId } = useParams<{
     orgId: string;
     taskId: string;
     automationId: string;
   }>();
+
+  // Use real automation ID when available
+  const realAutomationId = automation?.id || automationId;
+
   const [name, setName] = useState(automation?.name || '');
   const [isSaving, setIsSaving] = useState(false);
 
@@ -57,7 +64,7 @@ export function EditNameDialog({ open, onOpenChange }: EditNameDialogProps) {
     setIsSaving(true);
     try {
       const response = await api.patch(
-        `/v1/tasks/${taskId}/automations/${automationId}`,
+        `/v1/tasks/${taskId}/automations/${realAutomationId}`,
         { name: name.trim() },
         orgId,
       );
@@ -66,7 +73,8 @@ export function EditNameDialog({ open, onOpenChange }: EditNameDialogProps) {
         throw new Error(response.error);
       }
 
-      await mutate(); // Refresh automation data
+      await mutateLocal(); // Refresh automation data in hook
+      await onSuccess?.(); // Notify parent to refresh (e.g., overview page)
       onOpenChange(false);
       toast.success('Automation name updated');
     } catch (error) {
@@ -111,8 +119,12 @@ export function EditNameDialog({ open, onOpenChange }: EditNameDialogProps) {
   );
 }
 
-export function EditDescriptionDialog({ open, onOpenChange }: EditDescriptionDialogProps) {
-  const { automation, mutate } = useTaskAutomation();
+export function EditDescriptionDialog({
+  open,
+  onOpenChange,
+  onSuccess,
+}: EditDescriptionDialogProps) {
+  const { automation, mutate: mutateLocal } = useTaskAutomation();
   const { orgId, taskId, automationId } = useParams<{
     orgId: string;
     taskId: string;
@@ -139,7 +151,8 @@ export function EditDescriptionDialog({ open, onOpenChange }: EditDescriptionDia
         throw new Error(response.error);
       }
 
-      await mutate(); // Refresh automation data
+      await mutateLocal(); // Refresh automation data in hook
+      await onSuccess?.(); // Notify parent to refresh (e.g., overview page)
       onOpenChange(false);
       toast.success('Automation description updated');
     } catch (error) {
@@ -185,7 +198,7 @@ export function EditDescriptionDialog({ open, onOpenChange }: EditDescriptionDia
   );
 }
 
-export function DeleteAutomationDialog({ open, onOpenChange }: DeleteDialogProps) {
+export function DeleteAutomationDialog({ open, onOpenChange, onSuccess }: DeleteDialogProps) {
   const { automation } = useTaskAutomation();
   const { orgId, taskId, automationId } = useParams<{
     orgId: string;
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/PublishDialog.tsx b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/PublishDialog.tsx
index 452b1775b..49d98adb1 100644
--- a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/PublishDialog.tsx
+++ b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/PublishDialog.tsx
@@ -17,6 +17,7 @@ import { useState } from 'react';
 import { toast } from 'sonner';
 import { publishAutomation } from '../actions/task-automation-actions';
 import { useAutomationVersions } from '../hooks/use-automation-versions';
+import { useSharedChatContext } from '../lib/chat-context';
 
 interface PublishDialogProps {
   open: boolean;
@@ -24,11 +25,12 @@ interface PublishDialogProps {
 }
 
 export function PublishDialog({ open, onOpenChange }: PublishDialogProps) {
-  const { orgId, taskId, automationId } = useParams<{
+  const { orgId, taskId } = useParams<{
     orgId: string;
     taskId: string;
     automationId: string;
   }>();
+  const { automationIdRef } = useSharedChatContext();
   const [changelog, setChangelog] = useState('');
   const [isPublishing, setIsPublishing] = useState(false);
   const { mutate } = useAutomationVersions();
@@ -37,7 +39,12 @@ export function PublishDialog({ open, onOpenChange }: PublishDialogProps) {
     setIsPublishing(true);
 
     try {
-      const result = await publishAutomation(orgId, taskId, automationId, changelog || undefined);
+      const result = await publishAutomation(
+        orgId,
+        taskId,
+        automationIdRef.current,
+        changelog || undefined,
+      );
 
       if (!result.success) {
         throw new Error(result.error || 'Failed to publish');
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 e01cf1103..864ea49cc 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
@@ -20,7 +20,7 @@ export function EmptyState({
 }: EmptyStateProps) {
   return (
     <div className="flex-1 min-h-0 overflow-y-auto h-full z-20">
-      <div className="w-full h-full flex flex-col items-center py-48">
+      <div className="w-full h-full flex flex-col items-center py-48 px-4">
         <div className="w-full max-w-3xl text-center space-y-8 mb-16">
           <p className="text-2xl font-medium text-primary tracking-wide z-20">
             What evidence do you want to collect?
@@ -28,7 +28,7 @@ export function EmptyState({
           <Input
             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 hover:scale-[1.01] focus:shadow-lg focus:shadow-primary/10 focus:scale-[1.02] 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"
             value={input}
             onChange={(e) => onInputChange(e.target.value)}
             disabled={status === 'streaming' || status === 'submitted'}
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/chat/message-part/reasoning.tsx b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/chat/message-part/reasoning.tsx
index 7099e9518..82de941eb 100644
--- a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/chat/message-part/reasoning.tsx
+++ b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/chat/message-part/reasoning.tsx
@@ -61,7 +61,11 @@ export function Reasoning({ part, partIndex }: { part: ReasoningUIPart; partInde
         className="text-left w-full flex items-center gap-2.5 transition-all duration-200 group/btn"
         onClick={handleClick}
       >
-        <span className="text-xs text-muted-foreground truncate block">{getReasoningLabel()}</span>
+        <span
+          className={`text-xs truncate block ${isStreaming ? 'thinking-text' : 'text-muted-foreground'}`}
+        >
+          {getReasoningLabel()}
+        </span>
       </button>
     </div>
   );
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/chat/message.tsx b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/chat/message.tsx
index 47a35b42f..f7be9047c 100644
--- a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/chat/message.tsx
+++ b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/components/chat/message.tsx
@@ -113,7 +113,7 @@ export const Message = memo(function Message({
         if (thisSessionIsThinking) {
           result.push(
             <div key={`thinking-${sessionId}-active`} className="flex items-center gap-2 py-1">
-              <span className="text-xs text-muted-foreground">Thinking...</span>
+              <span className="text-xs thinking-text">Thinking...</span>
             </div>,
           );
         } else {
@@ -191,7 +191,7 @@ export const Message = memo(function Message({
       if (finalThinkingIsActive) {
         result.push(
           <div key={`thinking-${sessionId}-active`} className="flex items-center gap-2 py-1">
-            <span className="text-xs text-muted-foreground">Thinking...</span>
+            <span className="text-xs thinking-text">Thinking...</span>
           </div>,
         );
       } else {
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 ebeea30e2..54d5d8cf3 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
@@ -143,7 +143,12 @@ export function UnifiedWorkflowCard({ steps, title, onTest, integrationsUsed }:
           </div>
         ) : (
           <button
-            onClick={onTest}
+            type="button"
+            onClick={(e) => {
+              e.preventDefault();
+              e.stopPropagation();
+              onTest?.();
+            }}
             className="w-full flex items-center justify-center gap-2 px-4 py-2 rounded-lg bg-primary text-primary-foreground font-medium hover:bg-primary/90 transition-colors animate-in fade-in duration-500"
           >
             <Play className="w-4 h-4" />
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 d33f12521..7da44e667 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
@@ -26,6 +26,7 @@ import { useEffect, useMemo, useState } from 'react';
 import { toast } from 'sonner';
 import { restoreVersion } from '../../actions/task-automation-actions';
 import {
+  useTaskAutomation,
   useTaskAutomationAnalyze,
   useTaskAutomationExecution,
   useTaskAutomationScript,
@@ -57,13 +58,19 @@ export function WorkflowVisualizerSimple({ className }: Props) {
     taskId: string;
     automationId: string;
   }>();
-  const { chat } = useSharedChatContext();
+  const { chat, automationIdRef } = useSharedChatContext();
   const { sendMessage } = useChat<ChatUIMessage>({ chat });
   const [publishDialogOpen, setPublishDialogOpen] = useState(false);
   const [isRestoring, setIsRestoring] = useState(false);
   const [confirmRestore, setConfirmRestore] = useState<EvidenceAutomationVersion | null>(null);
+  const { automation } = useTaskAutomation();
   const { versions } = useAutomationVersions();
 
+  // Update shared ref when automation is loaded from hook
+  if (automation?.id && automationIdRef.current === 'new') {
+    automationIdRef.current = automation.id;
+  }
+
   const {
     script,
     isLoading: isLoadingScript,
@@ -71,15 +78,15 @@ export function WorkflowVisualizerSimple({ className }: Props) {
   } = useTaskAutomationScript({
     orgId: orgId,
     taskId: taskId,
-    automationId: automationId,
-    enabled: !!orgId && !!taskId && !!automationId,
+    automationId: automationIdRef.current,
+    enabled: !!orgId && !!taskId && automationIdRef.current !== 'new',
   });
 
   const handleRestoreVersion = async (version: EvidenceAutomationVersion) => {
     setIsRestoring(true);
 
     try {
-      const result = await restoreVersion(orgId, taskId, automationId, version.version);
+      const result = await restoreVersion(orgId, taskId, automationIdRef.current, version.version);
 
       if (!result.success) {
         throw new Error(result.error || 'Failed to restore version');
@@ -155,7 +162,10 @@ export function WorkflowVisualizerSimple({ className }: Props) {
   }, [executionResult, executionError]);
 
   const handleTest = async () => {
-    if (!orgId || !taskId) return;
+    if (!orgId || !taskId || automationIdRef.current === 'new') {
+      console.warn('Cannot test ephemeral automation');
+      return;
+    }
     await execute();
   };
 
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/hooks/index.ts b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/hooks/index.ts
index d1168b1d5..2bf217e08 100644
--- a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/hooks/index.ts
+++ b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/hooks/index.ts
@@ -1,3 +1,4 @@
+export { useTaskAutomation } from './use-task-automation';
 export { useTaskAutomationAnalyze } from './use-task-automation-analyze';
 export { useTaskAutomationExecution } from './use-task-automation-execution';
 export { useTaskAutomationScript } from './use-task-automation-script';
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/hooks/use-chat-handlers.ts b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/hooks/use-chat-handlers.ts
index 4e4cc9c96..bccff45ee 100644
--- a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/hooks/use-chat-handlers.ts
+++ b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/hooks/use-chat-handlers.ts
@@ -54,6 +54,9 @@ export function useChatHandlers({
           // Invalidate automations list cache so task page updates
           mutate([`task-automations-${taskId}`, orgId, taskId]);
 
+          // Invalidate the automation cache so breadcrumb updates
+          mutate([`automation-${realAutomationId}`, orgId, taskId, realAutomationId]);
+
           // Silently replace the URL without navigation/reload
           window.history.replaceState(
             null,
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 9df969afb..21e0563db 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
@@ -20,6 +20,7 @@
 
 import { useParams } from 'next/navigation';
 import { useCallback, useEffect, useRef, useState } from 'react';
+import { useSharedChatContext } from '../lib/chat-context';
 import { taskAutomationApi } from '../lib/task-automation-api';
 import type {
   TaskAutomationExecutionResult,
@@ -30,7 +31,7 @@ export function useTaskAutomationExecution({
   onSuccess,
   onError,
 }: UseTaskAutomationExecutionOptions = {}) {
-  const { orgId, taskId, automationId } = useParams<{
+  const { orgId, taskId } = useParams<{
     orgId: string;
     taskId: string;
     automationId: string;
@@ -41,6 +42,9 @@ export function useTaskAutomationExecution({
   const [error, setError] = useState<Error | null>(null);
   const pollingIntervalRef = useRef<NodeJS.Timeout | null>(null);
 
+  // Import shared automation ID ref from context
+  const { automationIdRef } = useSharedChatContext();
+
   // Poll for run status
   useEffect(() => {
     if (!runId || !isExecuting) return;
@@ -65,9 +69,6 @@ export function useTaskAutomationExecution({
             taskId: data.id,
           };
 
-          // Log the execution result on the client side
-          console.log('[Automation Execution] Client received result:', executionResult);
-
           setResult(executionResult);
           setIsExecuting(false);
           onSuccess?.(executionResult);
@@ -112,7 +113,7 @@ export function useTaskAutomationExecution({
       const response = await taskAutomationApi.execution.executeScript({
         orgId,
         taskId,
-        automationId,
+        automationId: automationIdRef.current,
       });
 
       // The API now returns a run ID that we can monitor
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/lib/chat-context.tsx b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/lib/chat-context.tsx
index ddb3aa4f1..5b124aba6 100644
--- a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/lib/chat-context.tsx
+++ b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/lib/chat-context.tsx
@@ -14,6 +14,7 @@ import { DataPart } from './types/data-parts';
 interface ChatContextValue {
   chat: Chat<ChatUIMessage>;
   updateAutomationId: (newId: string) => void;
+  automationIdRef: React.MutableRefObject<string>;
 }
 
 const ChatContext = createContext<ChatContextValue | undefined>(undefined);
@@ -38,6 +39,7 @@ export function ChatProvider({
   // Initialize once, don't overwrite on every render
   const automationIdRef = useRef(automationId);
   const hasBeenManuallyUpdated = useRef(false);
+  const isSavingRef = useRef(false);
 
   // Only update from params if it hasn't been manually set
   if (!hasBeenManuallyUpdated.current) {
@@ -66,28 +68,31 @@ export function ChatProvider({
         console.error('Error sending message:', error);
       },
       onFinish: async (event) => {
-        console.log('[Chat] onFinish triggered, saving to Redis...');
+        // Guard against concurrent saves
+        if (isSavingRef.current) {
+          return;
+        }
 
         // Get the current automation ID from ref (handles URL updates via replaceState)
         const currentAutomationId = automationIdRef.current;
-        console.log('[Chat] currentAutomationId:', currentAutomationId);
 
         if (currentAutomationId === 'new') {
-          console.log('[Chat] Skipping save - ephemeral automation');
           return;
         }
 
-        const messagesToSave = event.messages;
-        console.log('[Chat] Saving to automation:', currentAutomationId);
-
-        const result = await saveChatHistory(currentAutomationId, messagesToSave || []);
-        console.log('[Chat] Save result:', result);
+        isSavingRef.current = true;
+        try {
+          const messagesToSave = event.messages;
+          await saveChatHistory(currentAutomationId, messagesToSave || []);
+        } finally {
+          isSavingRef.current = false;
+        }
       },
     });
   }
 
   return (
-    <ChatContext.Provider value={{ chat: chatRef.current, updateAutomationId }}>
+    <ChatContext.Provider value={{ chat: chatRef.current, updateAutomationId, automationIdRef }}>
       {children}
     </ChatContext.Provider>
   );
diff --git a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/page.tsx b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/page.tsx
index 5009e7b48..29b582d24 100644
--- a/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/page.tsx
+++ b/apps/app/src/app/(app)/[orgId]/tasks/[taskId]/automation/[automationId]/page.tsx
@@ -30,7 +30,15 @@ export default async function Page({
   if (automationId !== 'new') {
     const historyResult = await loadChatHistory(automationId);
     if (historyResult.success && historyResult.data?.messages) {
-      initialMessages = historyResult.data.messages;
+      // Deduplicate messages by ID (in case of concurrent save/load race conditions)
+      const seen = new Set();
+      initialMessages = historyResult.data.messages.filter((msg: any) => {
+        if (seen.has(msg.id)) {
+          return false;
+        }
+        seen.add(msg.id);
+        return true;
+      });
     }
   }
 
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 733fa9ce3..2056ed6a9 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
@@ -9,8 +9,14 @@ import {
 } from '@comp/ui/breadcrumb';
 import { Button } from '@comp/ui/button';
 import { Card, CardContent, CardHeader, CardTitle } from '@comp/ui/card';
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuTrigger,
+} from '@comp/ui/dropdown-menu';
 import { EvidenceAutomation, EvidenceAutomationRun, EvidenceAutomationVersion, Task } from '@db';
-import { ChevronRight, Edit, Trash2 } from 'lucide-react';
+import { ChevronRight, Edit, FileText, MoreVertical, Trash2, Type } from 'lucide-react';
 import Link from 'next/link';
 import { useParams } from 'next/navigation';
 import { useMemo, useState } from 'react';
@@ -19,6 +25,7 @@ import {
   EditDescriptionDialog,
   EditNameDialog,
 } from '../../../../automation/[automationId]/components/AutomationSettingsDialogs';
+import { useTaskAutomation } from '../../../../automation/[automationId]/hooks/use-task-automation';
 import { AutomationRunsCard } from '../../../../components/AutomationRunsCard';
 import { MetricsSection } from './MetricsSection';
 
@@ -37,7 +44,7 @@ interface AutomationOverviewProps {
 
 export function AutomationOverview({
   task,
-  automation,
+  automation: initialAutomation,
   initialRuns,
   initialVersions,
 }: AutomationOverviewProps) {
@@ -51,6 +58,12 @@ export function AutomationOverview({
   const [editDescriptionOpen, setEditDescriptionOpen] = useState(false);
   const [deleteDialogOpen, setDeleteDialogOpen] = useState(false);
 
+  // Use the automation hook to get live data and mutate function
+  const { automation: liveAutomation, mutate: mutateAutomation } = useTaskAutomation();
+
+  // Use live data from hook if available, fallback to initial data
+  const automation = liveAutomation || initialAutomation;
+
   // Transform runs to include automation name
   const runsWithName = useMemo(
     () =>
@@ -130,14 +143,47 @@ export function AutomationOverview({
                       Edit
                     </Button>
                   </Link>
-                  <Button variant="outline" size="sm" onClick={() => setDeleteDialogOpen(true)}>
-                    <Trash2 className="h-4 w-4" />
-                  </Button>
+                  <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>
               </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">
+                  <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>
+                </div>
                 <div className="flex flex-col gap-1">
                   <p className="text-xs font-medium text-muted-foreground">Created</p>
                   <p className="text-sm">
@@ -157,17 +203,23 @@ export function AutomationOverview({
                 <div className="flex flex-col gap-1">
                   <p className="text-xs font-medium text-muted-foreground">Last Published</p>
                   <p className="text-sm">
-                    {new Date(runsWithName[0].createdAt).toLocaleDateString('en-US', {
-                      month: 'short',
-                      day: 'numeric',
-                      year: 'numeric',
-                    })}{' '}
-                    at{' '}
-                    {new Date(runsWithName[0].createdAt).toLocaleTimeString('en-US', {
-                      hour: 'numeric',
-                      minute: '2-digit',
-                      hour12: true,
-                    })}
+                    {runsWithName[0]?.createdAt ? (
+                      <>
+                        {new Date(runsWithName[0].createdAt).toLocaleDateString('en-US', {
+                          month: 'short',
+                          day: 'numeric',
+                          year: 'numeric',
+                        })}{' '}
+                        at{' '}
+                        {new Date(runsWithName[0].createdAt).toLocaleTimeString('en-US', {
+                          hour: 'numeric',
+                          minute: '2-digit',
+                          hour12: true,
+                        })}
+                      </>
+                    ) : (
+                      'Never'
+                    )}
                   </p>
                 </div>
               </div>
@@ -179,9 +231,21 @@ export function AutomationOverview({
       </div>
 
       {/* Settings Dialogs */}
-      <EditNameDialog open={editNameOpen} onOpenChange={setEditNameOpen} />
-      <EditDescriptionDialog open={editDescriptionOpen} onOpenChange={setEditDescriptionOpen} />
-      <DeleteAutomationDialog open={deleteDialogOpen} onOpenChange={setDeleteDialogOpen} />
+      <EditNameDialog
+        open={editNameOpen}
+        onOpenChange={setEditNameOpen}
+        onSuccess={mutateAutomation}
+      />
+      <EditDescriptionDialog
+        open={editDescriptionOpen}
+        onOpenChange={setEditDescriptionOpen}
+        onSuccess={mutateAutomation}
+      />
+      <DeleteAutomationDialog
+        open={deleteDialogOpen}
+        onOpenChange={setDeleteDialogOpen}
+        onSuccess={mutateAutomation}
+      />
     </div>
   );
 }
diff --git a/apps/app/src/styles/globals.css b/apps/app/src/styles/globals.css
index 7052c7f42..3fd9e4858 100644
--- a/apps/app/src/styles/globals.css
+++ b/apps/app/src/styles/globals.css
@@ -104,3 +104,28 @@ body {
     max-height: var(--final-height);
   }
 }
+
+@keyframes thinking-shimmer {
+  0% {
+    background-position: -200% center;
+  }
+  100% {
+    background-position: 200% center;
+  }
+}
+
+.thinking-text {
+  background: linear-gradient(
+    90deg,
+    hsl(var(--muted-foreground) / 0.6) 0%,
+    hsl(var(--primary)) 40%,
+    hsl(var(--foreground)) 50%,
+    hsl(var(--primary)) 60%,
+    hsl(var(--muted-foreground) / 0.6) 100%
+  );
+  background-size: 200% 100%;
+  -webkit-background-clip: text;
+  background-clip: text;
+  -webkit-text-fill-color: transparent;
+  animation: thinking-shimmer 3.5s ease-in-out infinite;
+}