diff --git a/.flow/tasks/fn-16.13.json b/.flow/tasks/fn-16.13.json
new file mode 100644
index 000000000..89be26f85
--- /dev/null
+++ b/.flow/tasks/fn-16.13.json
@@ -0,0 +1,21 @@
+{
+  "assignee": "bordumbb@gmail.com",
+  "claim_note": "",
+  "claimed_at": "2026-09-26T02:11:50.122844Z",
+  "created_at": "2026-09-26T02:08:42.244248Z",
+  "depends_on": [],
+  "epic": "fn-16",
+  "evidence": {
+    "commits": [],
+    "prs": [],
+    "tests": [
+      "DATABASE_URL=... uv run --no-sync pytest python-packages/dataing/tests/integration/api/test_investigation_snapshot_import.py -m integration --no-cov"
+    ]
+  },
+  "id": "fn-16.13",
+  "priority": null,
+  "spec_path": ".flow/tasks/fn-16.13.md",
+  "status": "done",
+  "title": "Snapshot import: stop inserting generated investigations.status",
+  "updated_at": "2026-09-26T02:18:24.729448Z"
+}
diff --git a/.flow/tasks/fn-16.13.md b/.flow/tasks/fn-16.13.md
new file mode 100644
index 000000000..a3f752726
--- /dev/null
+++ b/.flow/tasks/fn-16.13.md
@@ -0,0 +1,19 @@
+# fn-16.13 Snapshot import: stop inserting generated investigations.status
+
+## Description
+TBD
+
+## Acceptance
+## Acceptance
+- POST /investigations/import no longer writes the generated `status` column
+- Integration test (migrated schema) imports a valid archive: 200, row stored with replay outcome, status derived as 'completed'
+
+
+## Done summary
+Dropped the generated `status` column (and its "imported" value) from the snapshot import INSERT; status now derives from `outcome` ('completed').
+Test: tests/integration/api/test_investigation_snapshot_import.py builds a real archive with SnapshotBuilder and imports it against the migrated schema (RED: GeneratedAlwaysError, GREEN after fix).
+Also added shared `fixtures/database.py` (migrated_dsn/migrated_db) re-exported by CE and EE integration conftests.
+## Evidence
+- Commits:
+- Tests: DATABASE_URL=... uv run --no-sync pytest python-packages/dataing/tests/integration/api/test_investigation_snapshot_import.py -m integration --no-cov
+- PRs:
diff --git a/.flow/tasks/fn-16.14.json b/.flow/tasks/fn-16.14.json
new file mode 100644
index 000000000..28526e91e
--- /dev/null
+++ b/.flow/tasks/fn-16.14.json
@@ -0,0 +1,21 @@
+{
+  "assignee": "bordumbb@gmail.com",
+  "claim_note": "",
+  "claimed_at": "2026-09-26T02:18:24.996044Z",
+  "created_at": "2026-09-26T02:08:42.507450Z",
+  "depends_on": [],
+  "epic": "fn-16",
+  "evidence": {
+    "commits": [],
+    "prs": [],
+    "tests": [
+      "DATABASE_URL=... uv run --no-sync pytest python-packages/dataing-ee/tests/integration/core/automation/test_spawn_investigation.py -m integration --no-cov"
+    ]
+  },
+  "id": "fn-16.14",
+  "priority": null,
+  "spec_path": ".flow/tasks/fn-16.14.md",
+  "status": "done",
+  "title": "Automation spawn_investigation: valid AnomalyAlert via InvestigationStarterService",
+  "updated_at": "2026-09-26T02:29:51.445475Z"
+}
diff --git a/.flow/tasks/fn-16.14.md b/.flow/tasks/fn-16.14.md
new file mode 100644
index 000000000..c1ed72dd2
--- /dev/null
+++ b/.flow/tasks/fn-16.14.md
@@ -0,0 +1,22 @@
+# fn-16.14 Automation spawn_investigation: valid AnomalyAlert via InvestigationStarterService
+
+## Description
+TBD
+
+## Acceptance
+## Acceptance
+- `ActionExecutor._spawn_investigation` stores `alert` as a valid AnomalyAlert dump + `datasource_id`, via InvestigationStarterService (row + Temporal workflow)
+- Issue linked through `issue_investigation_runs` (trigger_type 'rule'); re-running returns the existing investigation
+- Fails cleanly (ActionResult.success False) when the issue has no dataset or no datasource resolves
+- Integration tests against the migrated schema
+
+
+## Done summary
+`_spawn_investigation` now builds an AnomalyAlert from the issue row (description-type metric, dataset from the issue, date from created_at, source_* from the issue) and starts it through InvestigationStarterService (alert JSONB = AnomalyAlert dump + datasource_id, Temporal workflow started).
+ExecutionContext gains a required `investigation_starter`. Datasource: `datasource_id` action param (must belong to the tenant), else the tenant's only active datasource, else a failed ActionResult.
+Issue link + dedupe via issue_investigation_runs (trigger_type 'rule', trigger_ref {rule_id}, execution_profile = profile).
+Tests: dataing-ee/tests/integration/core/automation/test_spawn_investigation.py (6 cases; RED: `column "issue_id" does not exist`).
+## Evidence
+- Commits:
+- Tests: DATABASE_URL=... uv run --no-sync pytest python-packages/dataing-ee/tests/integration/core/automation/test_spawn_investigation.py -m integration --no-cov
+- PRs:
diff --git a/.flow/tasks/fn-16.15.json b/.flow/tasks/fn-16.15.json
new file mode 100644
index 000000000..4476b49e4
--- /dev/null
+++ b/.flow/tasks/fn-16.15.json
@@ -0,0 +1,22 @@
+{
+  "assignee": "bordumbb@gmail.com",
+  "claim_note": "",
+  "claimed_at": "2026-09-26T02:29:52.197558Z",
+  "created_at": "2026-09-26T02:08:42.791298Z",
+  "depends_on": [],
+  "epic": "fn-16",
+  "evidence": {
+    "commits": [],
+    "prs": [],
+    "tests": [
+      "uv run --no-sync mypy python-packages/dataing/src python-packages/dataing-ee/src",
+      "uv run --no-sync pytest python-packages/dataing/tests --no-cov"
+    ]
+  },
+  "id": "fn-16.15",
+  "priority": null,
+  "spec_path": ".flow/tasks/fn-16.15.md",
+  "status": "done",
+  "title": "Delete dead AppDatabase.create_investigation",
+  "updated_at": "2026-09-26T02:58:33.360753Z"
+}
diff --git a/.flow/tasks/fn-16.15.md b/.flow/tasks/fn-16.15.md
new file mode 100644
index 000000000..2065ab0c2
--- /dev/null
+++ b/.flow/tasks/fn-16.15.md
@@ -0,0 +1,17 @@
+# fn-16.15 Delete dead AppDatabase.create_investigation
+
+## Description
+TBD
+
+## Acceptance
+## Acceptance
+- `AppDatabase.create_investigation` (old-schema insert, no callers) deleted
+
+
+## Done summary
+Deleted `AppDatabase.create_investigation` (pre-013 column insert). No callers: the other `create_investigation` hits are PostgresInvestigationRepository / the repository protocol / an entitlements test route.
+Verified: grep, mypy clean, CE 2044 passed / EE 458 passed.
+## Evidence
+- Commits:
+- Tests: uv run --no-sync mypy python-packages/dataing/src python-packages/dataing-ee/src, uv run --no-sync pytest python-packages/dataing/tests --no-cov
+- PRs:
diff --git a/.flow/tasks/fn-16.16.json b/.flow/tasks/fn-16.16.json
new file mode 100644
index 000000000..9cf05a375
--- /dev/null
+++ b/.flow/tasks/fn-16.16.json
@@ -0,0 +1,23 @@
+{
+  "assignee": "bordumbb@gmail.com",
+  "claim_note": "",
+  "claimed_at": "2026-09-26T02:33:18.975571Z",
+  "created_at": "2026-09-26T02:08:43.082252Z",
+  "depends_on": [],
+  "epic": "fn-16",
+  "evidence": {
+    "commits": [],
+    "prs": [],
+    "tests": [
+      "uv run --no-sync pytest python-packages/dataing/tests --no-cov",
+      "uv run --no-sync pytest python-packages/dataing-ee/tests --no-cov",
+      "pnpm typecheck && pnpm lint && pnpm test"
+    ]
+  },
+  "id": "fn-16.16",
+  "priority": null,
+  "spec_path": ".flow/tasks/fn-16.16.md",
+  "status": "done",
+  "title": "Delete approvals stack (pre-013 approval_requests)",
+  "updated_at": "2026-09-26T02:58:33.643752Z"
+}
diff --git a/.flow/tasks/fn-16.16.md b/.flow/tasks/fn-16.16.md
new file mode 100644
index 000000000..023a0fa9a
--- /dev/null
+++ b/.flow/tasks/fn-16.16.md
@@ -0,0 +1,21 @@
+# fn-16.16 Delete approvals stack (pre-013 approval_requests)
+
+## Description
+TBD
+
+## Acceptance
+## Acceptance
+- /approvals route, AppDatabase approval methods and `update_investigation_status` deleted (pre-013 approval_requests schema; no producer; Temporal HITL uses POST /investigations/{id}/input)
+- Frontend ContextReviewPage, its route and the approval notification link removed; client regenerated
+- ruff, ruff format --check, mypy, CE/EE unit tests and frontend checks pass
+
+
+## Done summary
+Deleted the approvals stack (user decision): routes/approvals.py + registration; AppDatabase create_approval_request / get_pending_approvals / make_approval_decision / update_investigation_status; dashboard pendingApprovals KPI (API field + card); dead producers notify_approval_required, EmailNotifier.send_approval_required, Slack approval.required formatting (+ their unit tests); frontend ContextReviewPage + context-review, /approvals route, notification-card approval branch, notification/webhook settings entries, query-keys.
+OpenAPI: removed the 7 approvals paths + 7 approval-only schemas + DashboardStats.pending_approvals from the committed spec (full regen adds +3222/-2087 unrelated drift); orval regenerated; 23 stale generated approval files + 22 index exports removed by hand (orval does not clean).
+Left + flagged: EE require_approval_for_queries setting (unenforced), domain_types Approval* models (unused), dashboard other old-schema queries.
+Verified: CE 2044 passed, EE 458 passed, mypy clean, ruff clean, frontend tsc/eslint/prettier/vitest (12) clean.
+## Evidence
+- Commits:
+- Tests: uv run --no-sync pytest python-packages/dataing/tests --no-cov, uv run --no-sync pytest python-packages/dataing-ee/tests --no-cov, pnpm typecheck && pnpm lint && pnpm test
+- PRs:
diff --git a/frontend/app/src/App.tsx b/frontend/app/src/App.tsx
index 9185d3769..aa55546b7 100644
--- a/frontend/app/src/App.tsx
+++ b/frontend/app/src/App.tsx
@@ -27,7 +27,6 @@ import { DashboardPage } from "@/features/dashboard/dashboard-page";
 import { InvestigationList } from "@/features/investigation/InvestigationList";
 import { InvestigationDetail } from "@/features/investigation/InvestigationDetail";
 import { NewInvestigation } from "@/features/investigation/NewInvestigation";
-import { ContextReviewPage } from "@/features/investigation/ContextReviewPage";
 import { DataSourcePage } from "@/features/datasources/datasource-page";
 import { DatasetListPage, DatasetDetailPage } from "@/features/datasets";
 import { SettingsPage } from "@/features/settings/settings-page";
@@ -167,14 +166,6 @@ function AppWithEntitlements() {
                       </FeatureErrorBoundary>
                     }
                   />
-                  <Route
-                    path="approvals/:approvalId"
-                    element={
-                      <FeatureErrorBoundary feature="context review">
-                        <ContextReviewPage />
-                      </FeatureErrorBoundary>
-                    }
-                  />
                   <Route
                     path="issues"
                     element={
diff --git a/frontend/app/src/features/dashboard/dashboard-page.tsx b/frontend/app/src/features/dashboard/dashboard-page.tsx
index 6b6218adf..42d9433ee 100644
--- a/frontend/app/src/features/dashboard/dashboard-page.tsx
+++ b/frontend/app/src/features/dashboard/dashboard-page.tsx
@@ -1,13 +1,6 @@
 import { useQuery } from "@tanstack/react-query";
 import { Link } from "react-router-dom";
-import {
-  Search,
-  Database,
-  CheckCircle2,
-  Clock,
-  AlertTriangle,
-  Plus,
-} from "lucide-react";
+import { Search, Database, CheckCircle2, Plus } from "lucide-react";
 
 import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/Card";
 import { Button } from "@/components/ui/Button";
@@ -41,7 +34,7 @@ export function DashboardPage() {
       />
 
       {/* Stats Grid */}
-      <div className="grid gap-4 md:grid-cols-2 lg:grid-cols-4">
+      <div className="grid gap-4 md:grid-cols-2 lg:grid-cols-3">
         <Card>
           <CardHeader className="flex flex-row items-center justify-between space-y-0 pb-2">
             <CardTitle className="text-sm font-medium">
@@ -93,32 +86,6 @@ export function DashboardPage() {
             )}
           </CardContent>
         </Card>
-
-        <Card>
-          <CardHeader className="flex flex-row items-center justify-between space-y-0 pb-2">
-            <CardTitle className="text-sm font-medium">
-              Pending Approvals
-            </CardTitle>
-            <Clock className="h-4 w-4 text-muted-foreground" />
-          </CardHeader>
-          <CardContent>
-            {isLoading ? (
-              <Skeleton className="h-8 w-16" />
-            ) : (
-              <>
-                <div className="text-2xl font-bold">
-                  {stats?.pendingApprovals ?? 0}
-                </div>
-                {(stats?.pendingApprovals ?? 0) > 0 && (
-                  <p className="text-xs text-muted-foreground">
-                    <AlertTriangle className="inline h-3 w-3 mr-1 text-yellow-500" />
-                    Requires attention
-                  </p>
-                )}
-              </>
-            )}
-          </CardContent>
-        </Card>
       </div>
 
       {/* Recent Investigations */}
diff --git a/frontend/app/src/features/investigation/ContextReviewPage.tsx b/frontend/app/src/features/investigation/ContextReviewPage.tsx
deleted file mode 100644
index 9c2f6fd2a..000000000
--- a/frontend/app/src/features/investigation/ContextReviewPage.tsx
+++ /dev/null
@@ -1,178 +0,0 @@
-import { useParams, useNavigate, Link } from "react-router-dom";
-import { ArrowLeft, Loader2 } from "lucide-react";
-import { toast } from "sonner";
-import { useQueryClient } from "@tanstack/react-query";
-
-import { Button } from "@/components/ui/Button";
-import { Card, CardContent } from "@/components/ui/Card";
-import { EmptyState } from "@/components/shared/empty-state";
-import {
-  useGetApprovalRequestApiV1ApprovalsApprovalIdGet,
-  useApproveRequestApiV1ApprovalsApprovalIdApprovePost,
-  useRejectRequestApiV1ApprovalsApprovalIdRejectPost,
-  getListPendingApprovalsApiV1ApprovalsPendingGetQueryKey,
-} from "@/lib/api/generated/approvals/approvals";
-import { ContextReview } from "./context-review";
-
-export function ContextReviewPage() {
-  const { approvalId } = useParams<{ approvalId: string }>();
-  const navigate = useNavigate();
-  const queryClient = useQueryClient();
-
-  const {
-    data: approval,
-    isLoading,
-    error,
-  } = useGetApprovalRequestApiV1ApprovalsApprovalIdGet(approvalId || "", {
-    query: { enabled: !!approvalId },
-  });
-
-  const approveMutation = useApproveRequestApiV1ApprovalsApprovalIdApprovePost({
-    mutation: {
-      onSuccess: () => {
-        queryClient.invalidateQueries({
-          queryKey: getListPendingApprovalsApiV1ApprovalsPendingGetQueryKey(),
-        });
-        toast.success("Investigation approved and resumed");
-        navigate(`/investigations/${approval?.investigation_id}`);
-      },
-      onError: (err: Error) => {
-        toast.error(`Failed to approve: ${err.message}`);
-      },
-    },
-  });
-
-  const rejectMutation = useRejectRequestApiV1ApprovalsApprovalIdRejectPost({
-    mutation: {
-      onSuccess: () => {
-        queryClient.invalidateQueries({
-          queryKey: getListPendingApprovalsApiV1ApprovalsPendingGetQueryKey(),
-        });
-        toast.success("Investigation rejected");
-        navigate("/investigations");
-      },
-      onError: (err: Error) => {
-        toast.error(`Failed to reject: ${err.message}`);
-      },
-    },
-  });
-
-  const handleApprove = async (comment?: string) => {
-    if (!approvalId) return;
-    await approveMutation.mutateAsync({
-      approvalId,
-      data: { comment: comment || null },
-    });
-  };
-
-  const handleReject = async (reason: string) => {
-    if (!approvalId) return;
-    await rejectMutation.mutateAsync({
-      approvalId,
-      data: { reason },
-    });
-  };
-
-  if (!approvalId) {
-    return (
-      <Card>
-        <CardContent className="py-12">
-          <EmptyState
-            icon={Loader2}
-            title="Approval ID not provided"
-            description="Please access this page from an approval notification link."
-          />
-        </CardContent>
-      </Card>
-    );
-  }
-
-  if (isLoading) {
-    return (
-      <div className="flex items-center justify-center py-12">
-        <Loader2 className="h-8 w-8 animate-spin text-muted-foreground" />
-      </div>
-    );
-  }
-
-  if (error || !approval) {
-    return (
-      <Card>
-        <CardContent className="py-12">
-          <EmptyState
-            icon={Loader2}
-            title="Approval request not found"
-            description="This approval request may have been completed or does not exist."
-            action={
-              <Link to="/investigations">
-                <Button>Back to Investigations</Button>
-              </Link>
-            }
-          />
-        </CardContent>
-      </Card>
-    );
-  }
-
-  // Check if already decided
-  if (approval.decision) {
-    return (
-      <div className="space-y-6">
-        <div className="flex items-center gap-4">
-          <Link to="/investigations">
-            <Button variant="ghost" size="icon">
-              <ArrowLeft className="h-4 w-4" />
-            </Button>
-          </Link>
-          <h1 className="text-2xl font-bold">Context Review</h1>
-        </div>
-        <Card>
-          <CardContent className="py-12">
-            <EmptyState
-              icon={Loader2}
-              title={`This request has been ${approval.decision}`}
-              description={
-                approval.comment || "No additional details provided."
-              }
-              action={
-                <Link to={`/investigations/${approval.investigation_id}`}>
-                  <Button>View Investigation</Button>
-                </Link>
-              }
-            />
-          </CardContent>
-        </Card>
-      </div>
-    );
-  }
-
-  // Build context object for ContextReview component
-  const context = {
-    query: (approval.context?.query as string) || "Query not available",
-    purpose:
-      (approval.context?.purpose as string) ||
-      `Review context for investigation ${approval.investigation_id}`,
-    tables_accessed: (approval.context?.tables_accessed as string[]) || [],
-    estimated_rows: (approval.context?.estimated_rows as number) || 0,
-  };
-
-  return (
-    <div className="space-y-6">
-      <div className="flex items-center gap-4">
-        <Link to="/investigations">
-          <Button variant="ghost" size="icon">
-            <ArrowLeft className="h-4 w-4" />
-          </Button>
-        </Link>
-        <h1 className="text-2xl font-bold">Context Review</h1>
-      </div>
-
-      <ContextReview
-        investigationId={approval.investigation_id}
-        context={context}
-        onApprove={handleApprove}
-        onReject={handleReject}
-      />
-    </div>
-  );
-}
diff --git a/frontend/app/src/features/investigation/context-review.tsx b/frontend/app/src/features/investigation/context-review.tsx
deleted file mode 100644
index e2b09d3f5..000000000
--- a/frontend/app/src/features/investigation/context-review.tsx
+++ /dev/null
@@ -1,194 +0,0 @@
-import * as React from "react";
-import { Check, X, AlertCircle } from "lucide-react";
-import { toast } from "sonner";
-
-import {
-  Card,
-  CardContent,
-  CardDescription,
-  CardHeader,
-  CardTitle,
-} from "@/components/ui/Card";
-import { Button } from "@/components/ui/Button";
-import { Textarea } from "@/components/ui/textarea";
-import { Badge } from "@/components/ui/Badge";
-import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert";
-
-interface ContextReviewProps {
-  investigationId: string;
-  context: {
-    query: string;
-    purpose: string;
-    tables_accessed: string[];
-    estimated_rows: number;
-  };
-  onApprove: (comment?: string) => void;
-  onReject: (reason: string) => void;
-}
-
-export function ContextReview({
-  investigationId,
-  context,
-  onApprove,
-  onReject,
-}: ContextReviewProps) {
-  const [comment, setComment] = React.useState("");
-  const [rejectReason, setRejectReason] = React.useState("");
-  const [showRejectForm, setShowRejectForm] = React.useState(false);
-  const [isSubmitting, setIsSubmitting] = React.useState(false);
-
-  const handleApprove = async () => {
-    setIsSubmitting(true);
-    try {
-      await onApprove(comment || undefined);
-      toast.success("Context approved");
-    } catch (error) {
-      toast.error("Failed to approve context");
-    } finally {
-      setIsSubmitting(false);
-    }
-  };
-
-  const handleReject = async () => {
-    if (!rejectReason.trim()) {
-      toast.error("Please provide a reason for rejection");
-      return;
-    }
-    setIsSubmitting(true);
-    try {
-      await onReject(rejectReason);
-      toast.success("Context rejected");
-    } catch (error) {
-      toast.error("Failed to reject context");
-    } finally {
-      setIsSubmitting(false);
-    }
-  };
-
-  return (
-    <Card>
-      <CardHeader>
-        <div className="flex items-center justify-between">
-          <div>
-            <CardTitle>Human-in-the-Loop Review</CardTitle>
-            <CardDescription>
-              Review and approve the proposed context for investigation{" "}
-              {investigationId}
-            </CardDescription>
-          </div>
-          <Badge variant="warning">Pending Approval</Badge>
-        </div>
-      </CardHeader>
-      <CardContent className="space-y-6">
-        <Alert>
-          <AlertCircle className="h-4 w-4" />
-          <AlertTitle>Context Review Required</AlertTitle>
-          <AlertDescription>
-            The system is requesting approval to access the following data.
-            Please review carefully before approving.
-          </AlertDescription>
-        </Alert>
-
-        <div className="space-y-4">
-          <div>
-            <h4 className="font-medium mb-2">Purpose</h4>
-            <p className="text-sm text-muted-foreground">{context.purpose}</p>
-          </div>
-
-          <div>
-            <h4 className="font-medium mb-2">Tables to Access</h4>
-            <div className="flex flex-wrap gap-2">
-              {context.tables_accessed.map((table) => (
-                <Badge key={table} variant="outline">
-                  {table}
-                </Badge>
-              ))}
-            </div>
-          </div>
-
-          <div>
-            <h4 className="font-medium mb-2">Estimated Data Volume</h4>
-            <p className="text-sm text-muted-foreground">
-              Approximately {context.estimated_rows.toLocaleString()} rows will
-              be analyzed
-            </p>
-          </div>
-
-          <div>
-            <h4 className="font-medium mb-2">Query</h4>
-            <pre className="p-4 bg-muted rounded-lg text-sm overflow-x-auto">
-              <code>{context.query}</code>
-            </pre>
-          </div>
-        </div>
-
-        {!showRejectForm ? (
-          <>
-            <div>
-              <h4 className="font-medium mb-2">Comment (Optional)</h4>
-              <Textarea
-                placeholder="Add any notes or comments..."
-                value={comment}
-                onChange={(e) => setComment(e.target.value)}
-              />
-            </div>
-
-            <div className="flex gap-2">
-              <Button
-                onClick={handleApprove}
-                disabled={isSubmitting}
-                className="flex-1"
-              >
-                <Check className="mr-2 h-4 w-4" />
-                Approve
-              </Button>
-              <Button
-                variant="outline"
-                onClick={() => setShowRejectForm(true)}
-                disabled={isSubmitting}
-                className="flex-1"
-              >
-                <X className="mr-2 h-4 w-4" />
-                Reject
-              </Button>
-            </div>
-          </>
-        ) : (
-          <>
-            <div>
-              <h4 className="font-medium mb-2">Rejection Reason</h4>
-              <Textarea
-                placeholder="Please explain why you are rejecting this context..."
-                value={rejectReason}
-                onChange={(e) => setRejectReason(e.target.value)}
-                required
-              />
-            </div>
-
-            <div className="flex gap-2">
-              <Button
-                variant="destructive"
-                onClick={handleReject}
-                disabled={isSubmitting || !rejectReason.trim()}
-                className="flex-1"
-              >
-                <X className="mr-2 h-4 w-4" />
-                Confirm Rejection
-              </Button>
-              <Button
-                variant="outline"
-                onClick={() => {
-                  setShowRejectForm(false);
-                  setRejectReason("");
-                }}
-                disabled={isSubmitting}
-              >
-                Cancel
-              </Button>
-            </div>
-          </>
-        )}
-      </CardContent>
-    </Card>
-  );
-}
diff --git a/frontend/app/src/features/notifications/components/notification-card.tsx b/frontend/app/src/features/notifications/components/notification-card.tsx
index 670c24163..4361e9a12 100644
--- a/frontend/app/src/features/notifications/components/notification-card.tsx
+++ b/frontend/app/src/features/notifications/components/notification-card.tsx
@@ -1,12 +1,9 @@
 /**
  * NotificationCard component for displaying individual notifications.
- *
- * Supports polymorphic rendering based on notification type.
  */
 
 import { Link } from "react-router-dom";
 import { Card } from "@/components/ui/Card";
-import { Button } from "@/components/ui/Button";
 import { Badge } from "@/components/ui/Badge";
 import { CheckCircle, XCircle, AlertTriangle, Info } from "lucide-react";
 import { cn } from "@/lib/utils";
@@ -81,45 +78,6 @@ export function NotificationCard({
     }
   };
 
-  // Polymorphic rendering for approval_required type
-  if (notification.type === "approval_required") {
-    // For approval notifications, the resource_id is the approval_request_id
-    const approvalLink = notification.resource_id
-      ? `/approvals/${notification.resource_id}`
-      : resourceLink;
-
-    return (
-      <Card className={cn("p-4", isUnread && "border-l-4 border-l-primary")}>
-        <div className="flex items-start gap-3">
-          <AlertTriangle className="size-5 mt-0.5 text-yellow-500" />
-          <div className="flex-1 space-y-2">
-            <div className="flex items-center justify-between gap-2">
-              <h4 className="font-semibold">{notification.title}</h4>
-              <Badge variant="destructive">Action Required</Badge>
-            </div>
-            {notification.body && (
-              <p className="text-sm text-muted-foreground">
-                {notification.body}
-              </p>
-            )}
-            <div className="flex gap-2 mt-3">
-              {approvalLink && (
-                <Button size="sm" asChild>
-                  <Link to={approvalLink} onClick={handleClick}>
-                    Review Context
-                  </Link>
-                </Button>
-              )}
-            </div>
-            <p className="text-xs text-muted-foreground">
-              {formatTimestamp(notification.created_at)}
-            </p>
-          </div>
-        </div>
-      </Card>
-    );
-  }
-
   // Default card for investigation_completed/failed
   const cardContent = (
     <Card
diff --git a/frontend/app/src/features/settings/notification-settings.tsx b/frontend/app/src/features/settings/notification-settings.tsx
index 44785144f..cc32dc383 100644
--- a/frontend/app/src/features/settings/notification-settings.tsx
+++ b/frontend/app/src/features/settings/notification-settings.tsx
@@ -15,11 +15,6 @@ const NOTIFICATION_SETTINGS = [
     label: "Investigation Complete",
     description: "Get notified when an investigation finishes.",
   },
-  {
-    id: "approval_required",
-    label: "Approval Required",
-    description: "Get notified when human-in-the-loop approval is needed.",
-  },
   {
     id: "error_alerts",
     label: "Error Alerts",
diff --git a/frontend/app/src/features/settings/webhook-settings.tsx b/frontend/app/src/features/settings/webhook-settings.tsx
index 8784ee018..17dd7a851 100644
--- a/frontend/app/src/features/settings/webhook-settings.tsx
+++ b/frontend/app/src/features/settings/webhook-settings.tsx
@@ -25,7 +25,6 @@ const EVENT_TYPES = [
   { id: "investigation.started", label: "Investigation Started" },
   { id: "investigation.completed", label: "Investigation Completed" },
   { id: "investigation.failed", label: "Investigation Failed" },
-  { id: "approval.required", label: "Approval Required" },
 ];
 
 export function WebhookSettings() {
diff --git a/frontend/app/src/lib/api/dashboard.ts b/frontend/app/src/lib/api/dashboard.ts
index 322bd8a61..0302eb445 100644
--- a/frontend/app/src/lib/api/dashboard.ts
+++ b/frontend/app/src/lib/api/dashboard.ts
@@ -4,7 +4,6 @@ export interface DashboardStats {
   activeInvestigations: number;
   completedToday: number;
   dataSources: number;
-  pendingApprovals: number;
 }
 
 export async function fetchDashboardStats(): Promise<DashboardStats> {
@@ -19,7 +18,6 @@ export async function fetchDashboardStats(): Promise<DashboardStats> {
       activeInvestigations: 3,
       completedToday: 7,
       dataSources: 2,
-      pendingApprovals: 1,
     };
   }
 }
diff --git a/frontend/app/src/lib/api/generated/approvals/approvals.ts b/frontend/app/src/lib/api/generated/approvals/approvals.ts
deleted file mode 100644
index ce3c86fe0..000000000
--- a/frontend/app/src/lib/api/generated/approvals/approvals.ts
+++ /dev/null
@@ -1,700 +0,0 @@
-/**
- * Generated by orval v6.31.0 🍺
- * Do not edit manually.
- * dataing
- * Autonomous Data Quality Investigation
- * OpenAPI spec version: 2.0.0
- */
-import { useMutation, useQuery } from "@tanstack/react-query";
-import type {
-  MutationFunction,
-  QueryFunction,
-  QueryKey,
-  UseMutationOptions,
-  UseMutationResult,
-  UseQueryOptions,
-  UseQueryResult,
-} from "@tanstack/react-query";
-import type {
-  ApprovalDecisionResponse,
-  ApprovalRequestResponse,
-  ApproveRequest,
-  CreateApprovalRequest,
-  HTTPValidationError,
-  ModifyRequest,
-  PendingApprovalsResponse,
-  RejectRequest,
-} from "../../model";
-import { customInstance } from "../../client";
-
-/**
- * List all pending approval requests for this tenant.
- * @summary List Pending Approvals
- */
-export const listPendingApprovalsApiV1ApprovalsPendingGet = (
-  signal?: AbortSignal,
-) => {
-  return customInstance<PendingApprovalsResponse>({
-    url: `/api/v1/approvals/pending`,
-    method: "GET",
-    signal,
-  });
-};
-
-export const getListPendingApprovalsApiV1ApprovalsPendingGetQueryKey = () => {
-  return [`/api/v1/approvals/pending`] as const;
-};
-
-export const getListPendingApprovalsApiV1ApprovalsPendingGetQueryOptions = <
-  TData = Awaited<
-    ReturnType<typeof listPendingApprovalsApiV1ApprovalsPendingGet>
-  >,
-  TError = unknown,
->(options?: {
-  query?: Partial<
-    UseQueryOptions<
-      Awaited<ReturnType<typeof listPendingApprovalsApiV1ApprovalsPendingGet>>,
-      TError,
-      TData
-    >
-  >;
-}) => {
-  const { query: queryOptions } = options ?? {};
-
-  const queryKey =
-    queryOptions?.queryKey ??
-    getListPendingApprovalsApiV1ApprovalsPendingGetQueryKey();
-
-  const queryFn: QueryFunction<
-    Awaited<ReturnType<typeof listPendingApprovalsApiV1ApprovalsPendingGet>>
-  > = ({ signal }) => listPendingApprovalsApiV1ApprovalsPendingGet(signal);
-
-  return { queryKey, queryFn, ...queryOptions } as UseQueryOptions<
-    Awaited<ReturnType<typeof listPendingApprovalsApiV1ApprovalsPendingGet>>,
-    TError,
-    TData
-  > & { queryKey: QueryKey };
-};
-
-export type ListPendingApprovalsApiV1ApprovalsPendingGetQueryResult =
-  NonNullable<
-    Awaited<ReturnType<typeof listPendingApprovalsApiV1ApprovalsPendingGet>>
-  >;
-export type ListPendingApprovalsApiV1ApprovalsPendingGetQueryError = unknown;
-
-/**
- * @summary List Pending Approvals
- */
-export const useListPendingApprovalsApiV1ApprovalsPendingGet = <
-  TData = Awaited<
-    ReturnType<typeof listPendingApprovalsApiV1ApprovalsPendingGet>
-  >,
-  TError = unknown,
->(options?: {
-  query?: Partial<
-    UseQueryOptions<
-      Awaited<ReturnType<typeof listPendingApprovalsApiV1ApprovalsPendingGet>>,
-      TError,
-      TData
-    >
-  >;
-}): UseQueryResult<TData, TError> & { queryKey: QueryKey } => {
-  const queryOptions =
-    getListPendingApprovalsApiV1ApprovalsPendingGetQueryOptions(options);
-
-  const query = useQuery(queryOptions) as UseQueryResult<TData, TError> & {
-    queryKey: QueryKey;
-  };
-
-  query.queryKey = queryOptions.queryKey;
-
-  return query;
-};
-
-/**
- * Get approval request details including context to review.
- * @summary Get Approval Request
- */
-export const getApprovalRequestApiV1ApprovalsApprovalIdGet = (
-  approvalId: string,
-  signal?: AbortSignal,
-) => {
-  return customInstance<ApprovalRequestResponse>({
-    url: `/api/v1/approvals/${approvalId}`,
-    method: "GET",
-    signal,
-  });
-};
-
-export const getGetApprovalRequestApiV1ApprovalsApprovalIdGetQueryKey = (
-  approvalId: string,
-) => {
-  return [`/api/v1/approvals/${approvalId}`] as const;
-};
-
-export const getGetApprovalRequestApiV1ApprovalsApprovalIdGetQueryOptions = <
-  TData = Awaited<
-    ReturnType<typeof getApprovalRequestApiV1ApprovalsApprovalIdGet>
-  >,
-  TError = HTTPValidationError,
->(
-  approvalId: string,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<
-        Awaited<
-          ReturnType<typeof getApprovalRequestApiV1ApprovalsApprovalIdGet>
-        >,
-        TError,
-        TData
-      >
-    >;
-  },
-) => {
-  const { query: queryOptions } = options ?? {};
-
-  const queryKey =
-    queryOptions?.queryKey ??
-    getGetApprovalRequestApiV1ApprovalsApprovalIdGetQueryKey(approvalId);
-
-  const queryFn: QueryFunction<
-    Awaited<ReturnType<typeof getApprovalRequestApiV1ApprovalsApprovalIdGet>>
-  > = ({ signal }) =>
-    getApprovalRequestApiV1ApprovalsApprovalIdGet(approvalId, signal);
-
-  return {
-    queryKey,
-    queryFn,
-    enabled: !!approvalId,
-    ...queryOptions,
-  } as UseQueryOptions<
-    Awaited<ReturnType<typeof getApprovalRequestApiV1ApprovalsApprovalIdGet>>,
-    TError,
-    TData
-  > & { queryKey: QueryKey };
-};
-
-export type GetApprovalRequestApiV1ApprovalsApprovalIdGetQueryResult =
-  NonNullable<
-    Awaited<ReturnType<typeof getApprovalRequestApiV1ApprovalsApprovalIdGet>>
-  >;
-export type GetApprovalRequestApiV1ApprovalsApprovalIdGetQueryError =
-  HTTPValidationError;
-
-/**
- * @summary Get Approval Request
- */
-export const useGetApprovalRequestApiV1ApprovalsApprovalIdGet = <
-  TData = Awaited<
-    ReturnType<typeof getApprovalRequestApiV1ApprovalsApprovalIdGet>
-  >,
-  TError = HTTPValidationError,
->(
-  approvalId: string,
-  options?: {
-    query?: Partial<
-      UseQueryOptions<
-        Awaited<
-          ReturnType<typeof getApprovalRequestApiV1ApprovalsApprovalIdGet>
-        >,
-        TError,
-        TData
-      >
-    >;
-  },
-): UseQueryResult<TData, TError> & { queryKey: QueryKey } => {
-  const queryOptions =
-    getGetApprovalRequestApiV1ApprovalsApprovalIdGetQueryOptions(
-      approvalId,
-      options,
-    );
-
-  const query = useQuery(queryOptions) as UseQueryResult<TData, TError> & {
-    queryKey: QueryKey;
-  };
-
-  query.queryKey = queryOptions.queryKey;
-
-  return query;
-};
-
-/**
- * Approve an investigation to proceed.
- * @summary Approve Request
- */
-export const approveRequestApiV1ApprovalsApprovalIdApprovePost = (
-  approvalId: string,
-  approveRequest: ApproveRequest,
-) => {
-  return customInstance<ApprovalDecisionResponse>({
-    url: `/api/v1/approvals/${approvalId}/approve`,
-    method: "POST",
-    headers: { "Content-Type": "application/json" },
-    data: approveRequest,
-  });
-};
-
-export const getApproveRequestApiV1ApprovalsApprovalIdApprovePostMutationOptions =
-  <TError = HTTPValidationError, TContext = unknown>(options?: {
-    mutation?: UseMutationOptions<
-      Awaited<
-        ReturnType<typeof approveRequestApiV1ApprovalsApprovalIdApprovePost>
-      >,
-      TError,
-      { approvalId: string; data: ApproveRequest },
-      TContext
-    >;
-  }): UseMutationOptions<
-    Awaited<
-      ReturnType<typeof approveRequestApiV1ApprovalsApprovalIdApprovePost>
-    >,
-    TError,
-    { approvalId: string; data: ApproveRequest },
-    TContext
-  > => {
-    const { mutation: mutationOptions } = options ?? {};
-
-    const mutationFn: MutationFunction<
-      Awaited<
-        ReturnType<typeof approveRequestApiV1ApprovalsApprovalIdApprovePost>
-      >,
-      { approvalId: string; data: ApproveRequest }
-    > = (props) => {
-      const { approvalId, data } = props ?? {};
-
-      return approveRequestApiV1ApprovalsApprovalIdApprovePost(
-        approvalId,
-        data,
-      );
-    };
-
-    return { mutationFn, ...mutationOptions };
-  };
-
-export type ApproveRequestApiV1ApprovalsApprovalIdApprovePostMutationResult =
-  NonNullable<
-    Awaited<
-      ReturnType<typeof approveRequestApiV1ApprovalsApprovalIdApprovePost>
-    >
-  >;
-export type ApproveRequestApiV1ApprovalsApprovalIdApprovePostMutationBody =
-  ApproveRequest;
-export type ApproveRequestApiV1ApprovalsApprovalIdApprovePostMutationError =
-  HTTPValidationError;
-
-/**
- * @summary Approve Request
- */
-export const useApproveRequestApiV1ApprovalsApprovalIdApprovePost = <
-  TError = HTTPValidationError,
-  TContext = unknown,
->(options?: {
-  mutation?: UseMutationOptions<
-    Awaited<
-      ReturnType<typeof approveRequestApiV1ApprovalsApprovalIdApprovePost>
-    >,
-    TError,
-    { approvalId: string; data: ApproveRequest },
-    TContext
-  >;
-}): UseMutationResult<
-  Awaited<ReturnType<typeof approveRequestApiV1ApprovalsApprovalIdApprovePost>>,
-  TError,
-  { approvalId: string; data: ApproveRequest },
-  TContext
-> => {
-  const mutationOptions =
-    getApproveRequestApiV1ApprovalsApprovalIdApprovePostMutationOptions(
-      options,
-    );
-
-  return useMutation(mutationOptions);
-};
-/**
- * Reject an investigation.
- * @summary Reject Request
- */
-export const rejectRequestApiV1ApprovalsApprovalIdRejectPost = (
-  approvalId: string,
-  rejectRequest: RejectRequest,
-) => {
-  return customInstance<ApprovalDecisionResponse>({
-    url: `/api/v1/approvals/${approvalId}/reject`,
-    method: "POST",
-    headers: { "Content-Type": "application/json" },
-    data: rejectRequest,
-  });
-};
-
-export const getRejectRequestApiV1ApprovalsApprovalIdRejectPostMutationOptions =
-  <TError = HTTPValidationError, TContext = unknown>(options?: {
-    mutation?: UseMutationOptions<
-      Awaited<
-        ReturnType<typeof rejectRequestApiV1ApprovalsApprovalIdRejectPost>
-      >,
-      TError,
-      { approvalId: string; data: RejectRequest },
-      TContext
-    >;
-  }): UseMutationOptions<
-    Awaited<ReturnType<typeof rejectRequestApiV1ApprovalsApprovalIdRejectPost>>,
-    TError,
-    { approvalId: string; data: RejectRequest },
-    TContext
-  > => {
-    const { mutation: mutationOptions } = options ?? {};
-
-    const mutationFn: MutationFunction<
-      Awaited<
-        ReturnType<typeof rejectRequestApiV1ApprovalsApprovalIdRejectPost>
-      >,
-      { approvalId: string; data: RejectRequest }
-    > = (props) => {
-      const { approvalId, data } = props ?? {};
-
-      return rejectRequestApiV1ApprovalsApprovalIdRejectPost(approvalId, data);
-    };
-
-    return { mutationFn, ...mutationOptions };
-  };
-
-export type RejectRequestApiV1ApprovalsApprovalIdRejectPostMutationResult =
-  NonNullable<
-    Awaited<ReturnType<typeof rejectRequestApiV1ApprovalsApprovalIdRejectPost>>
-  >;
-export type RejectRequestApiV1ApprovalsApprovalIdRejectPostMutationBody =
-  RejectRequest;
-export type RejectRequestApiV1ApprovalsApprovalIdRejectPostMutationError =
-  HTTPValidationError;
-
-/**
- * @summary Reject Request
- */
-export const useRejectRequestApiV1ApprovalsApprovalIdRejectPost = <
-  TError = HTTPValidationError,
-  TContext = unknown,
->(options?: {
-  mutation?: UseMutationOptions<
-    Awaited<ReturnType<typeof rejectRequestApiV1ApprovalsApprovalIdRejectPost>>,
-    TError,
-    { approvalId: string; data: RejectRequest },
-    TContext
-  >;
-}): UseMutationResult<
-  Awaited<ReturnType<typeof rejectRequestApiV1ApprovalsApprovalIdRejectPost>>,
-  TError,
-  { approvalId: string; data: RejectRequest },
-  TContext
-> => {
-  const mutationOptions =
-    getRejectRequestApiV1ApprovalsApprovalIdRejectPostMutationOptions(options);
-
-  return useMutation(mutationOptions);
-};
-/**
- * Approve with modifications.
-
-This allows reviewers to modify the investigation context before approving.
-For example, they can adjust which tables are included, modify query limits, etc.
- * @summary Modify And Approve
- */
-export const modifyAndApproveApiV1ApprovalsApprovalIdModifyPost = (
-  approvalId: string,
-  modifyRequest: ModifyRequest,
-) => {
-  return customInstance<ApprovalDecisionResponse>({
-    url: `/api/v1/approvals/${approvalId}/modify`,
-    method: "POST",
-    headers: { "Content-Type": "application/json" },
-    data: modifyRequest,
-  });
-};
-
-export const getModifyAndApproveApiV1ApprovalsApprovalIdModifyPostMutationOptions =
-  <TError = HTTPValidationError, TContext = unknown>(options?: {
-    mutation?: UseMutationOptions<
-      Awaited<
-        ReturnType<typeof modifyAndApproveApiV1ApprovalsApprovalIdModifyPost>
-      >,
-      TError,
-      { approvalId: string; data: ModifyRequest },
-      TContext
-    >;
-  }): UseMutationOptions<
-    Awaited<
-      ReturnType<typeof modifyAndApproveApiV1ApprovalsApprovalIdModifyPost>
-    >,
-    TError,
-    { approvalId: string; data: ModifyRequest },
-    TContext
-  > => {
-    const { mutation: mutationOptions } = options ?? {};
-
-    const mutationFn: MutationFunction<
-      Awaited<
-        ReturnType<typeof modifyAndApproveApiV1ApprovalsApprovalIdModifyPost>
-      >,
-      { approvalId: string; data: ModifyRequest }
-    > = (props) => {
-      const { approvalId, data } = props ?? {};
-
-      return modifyAndApproveApiV1ApprovalsApprovalIdModifyPost(
-        approvalId,
-        data,
-      );
-    };
-
-    return { mutationFn, ...mutationOptions };
-  };
-
-export type ModifyAndApproveApiV1ApprovalsApprovalIdModifyPostMutationResult =
-  NonNullable<
-    Awaited<
-      ReturnType<typeof modifyAndApproveApiV1ApprovalsApprovalIdModifyPost>
-    >
-  >;
-export type ModifyAndApproveApiV1ApprovalsApprovalIdModifyPostMutationBody =
-  ModifyRequest;
-export type ModifyAndApproveApiV1ApprovalsApprovalIdModifyPostMutationError =
-  HTTPValidationError;
-
-/**
- * @summary Modify And Approve
- */
-export const useModifyAndApproveApiV1ApprovalsApprovalIdModifyPost = <
-  TError = HTTPValidationError,
-  TContext = unknown,
->(options?: {
-  mutation?: UseMutationOptions<
-    Awaited<
-      ReturnType<typeof modifyAndApproveApiV1ApprovalsApprovalIdModifyPost>
-    >,
-    TError,
-    { approvalId: string; data: ModifyRequest },
-    TContext
-  >;
-}): UseMutationResult<
-  Awaited<
-    ReturnType<typeof modifyAndApproveApiV1ApprovalsApprovalIdModifyPost>
-  >,
-  TError,
-  { approvalId: string; data: ModifyRequest },
-  TContext
-> => {
-  const mutationOptions =
-    getModifyAndApproveApiV1ApprovalsApprovalIdModifyPostMutationOptions(
-      options,
-    );
-
-  return useMutation(mutationOptions);
-};
-/**
- * Create a new approval request.
-
-This is typically called by the system when an investigation reaches
-a point requiring human review (e.g., context review before executing queries).
- * @summary Create Approval Request
- */
-export const createApprovalRequestApiV1ApprovalsPost = (
-  createApprovalRequest: CreateApprovalRequest,
-) => {
-  return customInstance<ApprovalRequestResponse>({
-    url: `/api/v1/approvals/`,
-    method: "POST",
-    headers: { "Content-Type": "application/json" },
-    data: createApprovalRequest,
-  });
-};
-
-export const getCreateApprovalRequestApiV1ApprovalsPostMutationOptions = <
-  TError = HTTPValidationError,
-  TContext = unknown,
->(options?: {
-  mutation?: UseMutationOptions<
-    Awaited<ReturnType<typeof createApprovalRequestApiV1ApprovalsPost>>,
-    TError,
-    { data: CreateApprovalRequest },
-    TContext
-  >;
-}): UseMutationOptions<
-  Awaited<ReturnType<typeof createApprovalRequestApiV1ApprovalsPost>>,
-  TError,
-  { data: CreateApprovalRequest },
-  TContext
-> => {
-  const { mutation: mutationOptions } = options ?? {};
-
-  const mutationFn: MutationFunction<
-    Awaited<ReturnType<typeof createApprovalRequestApiV1ApprovalsPost>>,
-    { data: CreateApprovalRequest }
-  > = (props) => {
-    const { data } = props ?? {};
-
-    return createApprovalRequestApiV1ApprovalsPost(data);
-  };
-
-  return { mutationFn, ...mutationOptions };
-};
-
-export type CreateApprovalRequestApiV1ApprovalsPostMutationResult = NonNullable<
-  Awaited<ReturnType<typeof createApprovalRequestApiV1ApprovalsPost>>
->;
-export type CreateApprovalRequestApiV1ApprovalsPostMutationBody =
-  CreateApprovalRequest;
-export type CreateApprovalRequestApiV1ApprovalsPostMutationError =
-  HTTPValidationError;
-
-/**
- * @summary Create Approval Request
- */
-export const useCreateApprovalRequestApiV1ApprovalsPost = <
-  TError = HTTPValidationError,
-  TContext = unknown,
->(options?: {
-  mutation?: UseMutationOptions<
-    Awaited<ReturnType<typeof createApprovalRequestApiV1ApprovalsPost>>,
-    TError,
-    { data: CreateApprovalRequest },
-    TContext
-  >;
-}): UseMutationResult<
-  Awaited<ReturnType<typeof createApprovalRequestApiV1ApprovalsPost>>,
-  TError,
-  { data: CreateApprovalRequest },
-  TContext
-> => {
-  const mutationOptions =
-    getCreateApprovalRequestApiV1ApprovalsPostMutationOptions(options);
-
-  return useMutation(mutationOptions);
-};
-/**
- * Get all approval requests for a specific investigation.
- * @summary Get Investigation Approvals
- */
-export const getInvestigationApprovalsApiV1ApprovalsInvestigationInvestigationIdGet =
-  (investigationId: string, signal?: AbortSignal) => {
-    return customInstance<ApprovalRequestResponse[]>({
-      url: `/api/v1/approvals/investigation/${investigationId}`,
-      method: "GET",
-      signal,
-    });
-  };
-
-export const getGetInvestigationApprovalsApiV1ApprovalsInvestigationInvestigationIdGetQueryKey =
-  (investigationId: string) => {
-    return [`/api/v1/approvals/investigation/${investigationId}`] as const;
-  };
-
-export const getGetInvestigationApprovalsApiV1ApprovalsInvestigationInvestigationIdGetQueryOptions =
-  <
-    TData = Awaited<
-      ReturnType<
-        typeof getInvestigationApprovalsApiV1ApprovalsInvestigationInvestigationIdGet
-      >
-    >,
-    TError = HTTPValidationError,
-  >(
-    investigationId: string,
-    options?: {
-      query?: Partial<
-        UseQueryOptions<
-          Awaited<
-            ReturnType<
-              typeof getInvestigationApprovalsApiV1ApprovalsInvestigationInvestigationIdGet
-            >
-          >,
-          TError,
-          TData
-        >
-      >;
-    },
-  ) => {
-    const { query: queryOptions } = options ?? {};
-
-    const queryKey =
-      queryOptions?.queryKey ??
-      getGetInvestigationApprovalsApiV1ApprovalsInvestigationInvestigationIdGetQueryKey(
-        investigationId,
-      );
-
-    const queryFn: QueryFunction<
-      Awaited<
-        ReturnType<
-          typeof getInvestigationApprovalsApiV1ApprovalsInvestigationInvestigationIdGet
-        >
-      >
-    > = ({ signal }) =>
-      getInvestigationApprovalsApiV1ApprovalsInvestigationInvestigationIdGet(
-        investigationId,
-        signal,
-      );
-
-    return {
-      queryKey,
-      queryFn,
-      enabled: !!investigationId,
-      ...queryOptions,
-    } as UseQueryOptions<
-      Awaited<
-        ReturnType<
-          typeof getInvestigationApprovalsApiV1ApprovalsInvestigationInvestigationIdGet
-        >
-      >,
-      TError,
-      TData
-    > & { queryKey: QueryKey };
-  };
-
-export type GetInvestigationApprovalsApiV1ApprovalsInvestigationInvestigationIdGetQueryResult =
-  NonNullable<
-    Awaited<
-      ReturnType<
-        typeof getInvestigationApprovalsApiV1ApprovalsInvestigationInvestigationIdGet
-      >
-    >
-  >;
-export type GetInvestigationApprovalsApiV1ApprovalsInvestigationInvestigationIdGetQueryError =
-  HTTPValidationError;
-
-/**
- * @summary Get Investigation Approvals
- */
-export const useGetInvestigationApprovalsApiV1ApprovalsInvestigationInvestigationIdGet =
-  <
-    TData = Awaited<
-      ReturnType<
-        typeof getInvestigationApprovalsApiV1ApprovalsInvestigationInvestigationIdGet
-      >
-    >,
-    TError = HTTPValidationError,
-  >(
-    investigationId: string,
-    options?: {
-      query?: Partial<
-        UseQueryOptions<
-          Awaited<
-            ReturnType<
-              typeof getInvestigationApprovalsApiV1ApprovalsInvestigationInvestigationIdGet
-            >
-          >,
-          TError,
-          TData
-        >
-      >;
-    },
-  ): UseQueryResult<TData, TError> & { queryKey: QueryKey } => {
-    const queryOptions =
-      getGetInvestigationApprovalsApiV1ApprovalsInvestigationInvestigationIdGetQueryOptions(
-        investigationId,
-        options,
-      );
-
-    const query = useQuery(queryOptions) as UseQueryResult<TData, TError> & {
-      queryKey: QueryKey;
-    };
-
-    query.queryKey = queryOptions.queryKey;
-
-    return query;
-  };
diff --git a/frontend/app/src/lib/api/model/approvalDecisionResponse.ts b/frontend/app/src/lib/api/model/approvalDecisionResponse.ts
deleted file mode 100644
index 97d4200fc..000000000
--- a/frontend/app/src/lib/api/model/approvalDecisionResponse.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * Generated by orval v6.31.0 🍺
- * Do not edit manually.
- * dataing
- * Autonomous Data Quality Investigation
- * OpenAPI spec version: 2.0.0
- */
-import type { ApprovalDecisionResponseComment } from "./approvalDecisionResponseComment";
-
-/**
- * Response for an approval decision.
- */
-export interface ApprovalDecisionResponse {
-  comment?: ApprovalDecisionResponseComment;
-  decided_at: string;
-  decided_by: string;
-  decision: string;
-  id: string;
-  investigation_id: string;
-}
diff --git a/frontend/app/src/lib/api/model/approvalDecisionResponseComment.ts b/frontend/app/src/lib/api/model/approvalDecisionResponseComment.ts
deleted file mode 100644
index 54a754f57..000000000
--- a/frontend/app/src/lib/api/model/approvalDecisionResponseComment.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-/**
- * Generated by orval v6.31.0 🍺
- * Do not edit manually.
- * dataing
- * Autonomous Data Quality Investigation
- * OpenAPI spec version: 2.0.0
- */
-
-export type ApprovalDecisionResponseComment = string | null;
diff --git a/frontend/app/src/lib/api/model/approvalRequestResponse.ts b/frontend/app/src/lib/api/model/approvalRequestResponse.ts
deleted file mode 100644
index e046d1af2..000000000
--- a/frontend/app/src/lib/api/model/approvalRequestResponse.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * Generated by orval v6.31.0 🍺
- * Do not edit manually.
- * dataing
- * Autonomous Data Quality Investigation
- * OpenAPI spec version: 2.0.0
- */
-import type { ApprovalRequestResponseComment } from "./approvalRequestResponseComment";
-import type { ApprovalRequestResponseContext } from "./approvalRequestResponseContext";
-import type { ApprovalRequestResponseDatasetId } from "./approvalRequestResponseDatasetId";
-import type { ApprovalRequestResponseDecidedAt } from "./approvalRequestResponseDecidedAt";
-import type { ApprovalRequestResponseDecidedBy } from "./approvalRequestResponseDecidedBy";
-import type { ApprovalRequestResponseDecision } from "./approvalRequestResponseDecision";
-import type { ApprovalRequestResponseMetricName } from "./approvalRequestResponseMetricName";
-import type { ApprovalRequestResponseModifications } from "./approvalRequestResponseModifications";
-import type { ApprovalRequestResponseSeverity } from "./approvalRequestResponseSeverity";
-
-/**
- * Response for an approval request.
- */
-export interface ApprovalRequestResponse {
-  comment?: ApprovalRequestResponseComment;
-  context: ApprovalRequestResponseContext;
-  dataset_id?: ApprovalRequestResponseDatasetId;
-  decided_at?: ApprovalRequestResponseDecidedAt;
-  decided_by?: ApprovalRequestResponseDecidedBy;
-  decision?: ApprovalRequestResponseDecision;
-  id: string;
-  investigation_id: string;
-  metric_name?: ApprovalRequestResponseMetricName;
-  modifications?: ApprovalRequestResponseModifications;
-  request_type: string;
-  requested_at: string;
-  requested_by: string;
-  severity?: ApprovalRequestResponseSeverity;
-}
diff --git a/frontend/app/src/lib/api/model/approvalRequestResponseComment.ts b/frontend/app/src/lib/api/model/approvalRequestResponseComment.ts
deleted file mode 100644
index b91ed5d03..000000000
--- a/frontend/app/src/lib/api/model/approvalRequestResponseComment.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-/**
- * Generated by orval v6.31.0 🍺
- * Do not edit manually.
- * dataing
- * Autonomous Data Quality Investigation
- * OpenAPI spec version: 2.0.0
- */
-
-export type ApprovalRequestResponseComment = string | null;
diff --git a/frontend/app/src/lib/api/model/approvalRequestResponseContext.ts b/frontend/app/src/lib/api/model/approvalRequestResponseContext.ts
deleted file mode 100644
index edf01a35c..000000000
--- a/frontend/app/src/lib/api/model/approvalRequestResponseContext.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-/**
- * Generated by orval v6.31.0 🍺
- * Do not edit manually.
- * dataing
- * Autonomous Data Quality Investigation
- * OpenAPI spec version: 2.0.0
- */
-
-export type ApprovalRequestResponseContext = { [key: string]: unknown };
diff --git a/frontend/app/src/lib/api/model/approvalRequestResponseDatasetId.ts b/frontend/app/src/lib/api/model/approvalRequestResponseDatasetId.ts
deleted file mode 100644
index 26ab75e5c..000000000
--- a/frontend/app/src/lib/api/model/approvalRequestResponseDatasetId.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-/**
- * Generated by orval v6.31.0 🍺
- * Do not edit manually.
- * dataing
- * Autonomous Data Quality Investigation
- * OpenAPI spec version: 2.0.0
- */
-
-export type ApprovalRequestResponseDatasetId = string | null;
diff --git a/frontend/app/src/lib/api/model/approvalRequestResponseDecidedAt.ts b/frontend/app/src/lib/api/model/approvalRequestResponseDecidedAt.ts
deleted file mode 100644
index 25cd48669..000000000
--- a/frontend/app/src/lib/api/model/approvalRequestResponseDecidedAt.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-/**
- * Generated by orval v6.31.0 🍺
- * Do not edit manually.
- * dataing
- * Autonomous Data Quality Investigation
- * OpenAPI spec version: 2.0.0
- */
-
-export type ApprovalRequestResponseDecidedAt = string | null;
diff --git a/frontend/app/src/lib/api/model/approvalRequestResponseDecidedBy.ts b/frontend/app/src/lib/api/model/approvalRequestResponseDecidedBy.ts
deleted file mode 100644
index ca51037b8..000000000
--- a/frontend/app/src/lib/api/model/approvalRequestResponseDecidedBy.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-/**
- * Generated by orval v6.31.0 🍺
- * Do not edit manually.
- * dataing
- * Autonomous Data Quality Investigation
- * OpenAPI spec version: 2.0.0
- */
-
-export type ApprovalRequestResponseDecidedBy = string | null;
diff --git a/frontend/app/src/lib/api/model/approvalRequestResponseDecision.ts b/frontend/app/src/lib/api/model/approvalRequestResponseDecision.ts
deleted file mode 100644
index a41567a5e..000000000
--- a/frontend/app/src/lib/api/model/approvalRequestResponseDecision.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-/**
- * Generated by orval v6.31.0 🍺
- * Do not edit manually.
- * dataing
- * Autonomous Data Quality Investigation
- * OpenAPI spec version: 2.0.0
- */
-
-export type ApprovalRequestResponseDecision = string | null;
diff --git a/frontend/app/src/lib/api/model/approvalRequestResponseMetricName.ts b/frontend/app/src/lib/api/model/approvalRequestResponseMetricName.ts
deleted file mode 100644
index ef45c235f..000000000
--- a/frontend/app/src/lib/api/model/approvalRequestResponseMetricName.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-/**
- * Generated by orval v6.31.0 🍺
- * Do not edit manually.
- * dataing
- * Autonomous Data Quality Investigation
- * OpenAPI spec version: 2.0.0
- */
-
-export type ApprovalRequestResponseMetricName = string | null;
diff --git a/frontend/app/src/lib/api/model/approvalRequestResponseModifications.ts b/frontend/app/src/lib/api/model/approvalRequestResponseModifications.ts
deleted file mode 100644
index 2b162b553..000000000
--- a/frontend/app/src/lib/api/model/approvalRequestResponseModifications.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-/**
- * Generated by orval v6.31.0 🍺
- * Do not edit manually.
- * dataing
- * Autonomous Data Quality Investigation
- * OpenAPI spec version: 2.0.0
- */
-import type { ApprovalRequestResponseModificationsAnyOf } from "./approvalRequestResponseModificationsAnyOf";
-
-export type ApprovalRequestResponseModifications =
-  ApprovalRequestResponseModificationsAnyOf | null;
diff --git a/frontend/app/src/lib/api/model/approvalRequestResponseModificationsAnyOf.ts b/frontend/app/src/lib/api/model/approvalRequestResponseModificationsAnyOf.ts
deleted file mode 100644
index bade6172e..000000000
--- a/frontend/app/src/lib/api/model/approvalRequestResponseModificationsAnyOf.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-/**
- * Generated by orval v6.31.0 🍺
- * Do not edit manually.
- * dataing
- * Autonomous Data Quality Investigation
- * OpenAPI spec version: 2.0.0
- */
-
-export type ApprovalRequestResponseModificationsAnyOf = {
-  [key: string]: unknown;
-};
diff --git a/frontend/app/src/lib/api/model/approvalRequestResponseSeverity.ts b/frontend/app/src/lib/api/model/approvalRequestResponseSeverity.ts
deleted file mode 100644
index bba2b2d77..000000000
--- a/frontend/app/src/lib/api/model/approvalRequestResponseSeverity.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-/**
- * Generated by orval v6.31.0 🍺
- * Do not edit manually.
- * dataing
- * Autonomous Data Quality Investigation
- * OpenAPI spec version: 2.0.0
- */
-
-export type ApprovalRequestResponseSeverity = string | null;
diff --git a/frontend/app/src/lib/api/model/approveRequest.ts b/frontend/app/src/lib/api/model/approveRequest.ts
deleted file mode 100644
index 9965ec8e8..000000000
--- a/frontend/app/src/lib/api/model/approveRequest.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
- * Generated by orval v6.31.0 🍺
- * Do not edit manually.
- * dataing
- * Autonomous Data Quality Investigation
- * OpenAPI spec version: 2.0.0
- */
-import type { ApproveRequestComment } from "./approveRequestComment";
-
-/**
- * Request to approve an investigation.
- */
-export interface ApproveRequest {
-  comment?: ApproveRequestComment;
-}
diff --git a/frontend/app/src/lib/api/model/approveRequestComment.ts b/frontend/app/src/lib/api/model/approveRequestComment.ts
deleted file mode 100644
index 22de99766..000000000
--- a/frontend/app/src/lib/api/model/approveRequestComment.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-/**
- * Generated by orval v6.31.0 🍺
- * Do not edit manually.
- * dataing
- * Autonomous Data Quality Investigation
- * OpenAPI spec version: 2.0.0
- */
-
-export type ApproveRequestComment = string | null;
diff --git a/frontend/app/src/lib/api/model/createApprovalRequest.ts b/frontend/app/src/lib/api/model/createApprovalRequest.ts
deleted file mode 100644
index f4f84cf0d..000000000
--- a/frontend/app/src/lib/api/model/createApprovalRequest.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * Generated by orval v6.31.0 🍺
- * Do not edit manually.
- * dataing
- * Autonomous Data Quality Investigation
- * OpenAPI spec version: 2.0.0
- */
-import type { CreateApprovalRequestContext } from "./createApprovalRequestContext";
-
-/**
- * Request to create a new approval request.
- */
-export interface CreateApprovalRequest {
-  context: CreateApprovalRequestContext;
-  investigation_id: string;
-  /** @pattern ^(context_review|query_approval|execution_approval)$ */
-  request_type: string;
-}
diff --git a/frontend/app/src/lib/api/model/createApprovalRequestContext.ts b/frontend/app/src/lib/api/model/createApprovalRequestContext.ts
deleted file mode 100644
index 3c11d2653..000000000
--- a/frontend/app/src/lib/api/model/createApprovalRequestContext.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-/**
- * Generated by orval v6.31.0 🍺
- * Do not edit manually.
- * dataing
- * Autonomous Data Quality Investigation
- * OpenAPI spec version: 2.0.0
- */
-
-export type CreateApprovalRequestContext = { [key: string]: unknown };
diff --git a/frontend/app/src/lib/api/model/dashboardStats.ts b/frontend/app/src/lib/api/model/dashboardStats.ts
index 893eb6c83..444672405 100644
--- a/frontend/app/src/lib/api/model/dashboardStats.ts
+++ b/frontend/app/src/lib/api/model/dashboardStats.ts
@@ -13,5 +13,4 @@ export interface DashboardStats {
   active_investigations: number;
   completed_today: number;
   data_sources: number;
-  pending_approvals: number;
 }
diff --git a/frontend/app/src/lib/api/model/index.ts b/frontend/app/src/lib/api/model/index.ts
index 26b9f0512..095f6af11 100644
--- a/frontend/app/src/lib/api/model/index.ts
+++ b/frontend/app/src/lib/api/model/index.ts
@@ -25,21 +25,6 @@ export * from "./apiKeyCreatedResponseExpiresAt";
 export * from "./apiKeyResponse";
 export * from "./apiKeyResponseExpiresAt";
 export * from "./apiKeyResponseLastUsedAt";
-export * from "./approvalDecisionResponse";
-export * from "./approvalDecisionResponseComment";
-export * from "./approvalRequestResponse";
-export * from "./approvalRequestResponseComment";
-export * from "./approvalRequestResponseContext";
-export * from "./approvalRequestResponseDatasetId";
-export * from "./approvalRequestResponseDecidedAt";
-export * from "./approvalRequestResponseDecidedBy";
-export * from "./approvalRequestResponseDecision";
-export * from "./approvalRequestResponseMetricName";
-export * from "./approvalRequestResponseModifications";
-export * from "./approvalRequestResponseModificationsAnyOf";
-export * from "./approvalRequestResponseSeverity";
-export * from "./approveRequest";
-export * from "./approveRequestComment";
 export * from "./assetInstanceResult";
 export * from "./assetInstanceResultSchemaName";
 export * from "./assetInstanceSearchResponse";
@@ -108,8 +93,6 @@ export * from "./contextBundleResponseLineage";
 export * from "./contextBundleResponseOperational";
 export * from "./createApiKeyRequest";
 export * from "./createApiKeyRequestExpiresInDays";
-export * from "./createApprovalRequest";
-export * from "./createApprovalRequestContext";
 export * from "./createBundleRequest";
 export * from "./createBundleRequestWindow";
 export * from "./createDataSourceRequest";
@@ -360,9 +343,6 @@ export * from "./matchedPatternResponse";
 export * from "./matchedPatternResponseDescription";
 export * from "./metricSpecRequest";
 export * from "./metricSpecRequestSourceUrl";
-export * from "./modifyRequest";
-export * from "./modifyRequestComment";
-export * from "./modifyRequestModifications";
 export * from "./notificationListResponse";
 export * from "./notificationListResponseNextCursor";
 export * from "./notificationResponse";
@@ -378,7 +358,6 @@ export * from "./orgMemberResponse";
 export * from "./orgMemberResponseName";
 export * from "./passwordResetConfirm";
 export * from "./passwordResetRequest";
-export * from "./pendingApprovalsResponse";
 export * from "./permissionGrantCreate";
 export * from "./permissionGrantCreateAccessType";
 export * from "./permissionGrantCreateDataSourceId";
@@ -405,7 +384,6 @@ export * from "./recoveryMethodResponseAdminEmail";
 export * from "./refreshRequest";
 export * from "./registerRequest";
 export * from "./registerRequestOrgSlug";
-export * from "./rejectRequest";
 export * from "./removeOrgMemberApiV1UsersUserIdRemovePost200";
 export * from "./replaceUserApiV1ScimV2UsersUserIdPut200";
 export * from "./repoMappingListResponse";
diff --git a/frontend/app/src/lib/api/model/modifyRequest.ts b/frontend/app/src/lib/api/model/modifyRequest.ts
deleted file mode 100644
index c5811b196..000000000
--- a/frontend/app/src/lib/api/model/modifyRequest.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * Generated by orval v6.31.0 🍺
- * Do not edit manually.
- * dataing
- * Autonomous Data Quality Investigation
- * OpenAPI spec version: 2.0.0
- */
-import type { ModifyRequestComment } from "./modifyRequestComment";
-import type { ModifyRequestModifications } from "./modifyRequestModifications";
-
-/**
- * Request to approve with modifications.
- */
-export interface ModifyRequest {
-  comment?: ModifyRequestComment;
-  modifications: ModifyRequestModifications;
-}
diff --git a/frontend/app/src/lib/api/model/modifyRequestComment.ts b/frontend/app/src/lib/api/model/modifyRequestComment.ts
deleted file mode 100644
index 75ec675db..000000000
--- a/frontend/app/src/lib/api/model/modifyRequestComment.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-/**
- * Generated by orval v6.31.0 🍺
- * Do not edit manually.
- * dataing
- * Autonomous Data Quality Investigation
- * OpenAPI spec version: 2.0.0
- */
-
-export type ModifyRequestComment = string | null;
diff --git a/frontend/app/src/lib/api/model/modifyRequestModifications.ts b/frontend/app/src/lib/api/model/modifyRequestModifications.ts
deleted file mode 100644
index e50f02488..000000000
--- a/frontend/app/src/lib/api/model/modifyRequestModifications.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-/**
- * Generated by orval v6.31.0 🍺
- * Do not edit manually.
- * dataing
- * Autonomous Data Quality Investigation
- * OpenAPI spec version: 2.0.0
- */
-
-export type ModifyRequestModifications = { [key: string]: unknown };
diff --git a/frontend/app/src/lib/api/model/pendingApprovalsResponse.ts b/frontend/app/src/lib/api/model/pendingApprovalsResponse.ts
deleted file mode 100644
index 2b39a5df4..000000000
--- a/frontend/app/src/lib/api/model/pendingApprovalsResponse.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- * Generated by orval v6.31.0 🍺
- * Do not edit manually.
- * dataing
- * Autonomous Data Quality Investigation
- * OpenAPI spec version: 2.0.0
- */
-import type { ApprovalRequestResponse } from "./approvalRequestResponse";
-
-/**
- * Response for listing pending approvals.
- */
-export interface PendingApprovalsResponse {
-  approvals: ApprovalRequestResponse[];
-  total: number;
-}
diff --git a/frontend/app/src/lib/api/model/rejectRequest.ts b/frontend/app/src/lib/api/model/rejectRequest.ts
deleted file mode 100644
index 4e8cbce6c..000000000
--- a/frontend/app/src/lib/api/model/rejectRequest.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * Generated by orval v6.31.0 🍺
- * Do not edit manually.
- * dataing
- * Autonomous Data Quality Investigation
- * OpenAPI spec version: 2.0.0
- */
-
-/**
- * Request to reject an investigation.
- */
-export interface RejectRequest {
-  /**
-   * @minLength 1
-   * @maxLength 1000
-   */
-  reason: string;
-}
diff --git a/frontend/app/src/lib/api/query-keys.ts b/frontend/app/src/lib/api/query-keys.ts
index f6b75d839..a150f13b4 100644
--- a/frontend/app/src/lib/api/query-keys.ts
+++ b/frontend/app/src/lib/api/query-keys.ts
@@ -73,13 +73,6 @@ export const queryKeys = {
     webhooks: ["/api/v1/settings/webhooks"] as const,
   },
 
-  // Approvals
-  approvals: {
-    all: ["/api/v1/approvals/"] as const,
-    pending: ["/api/v1/approvals/", { status: "pending" }] as const,
-    detail: (id: string) => [`/api/v1/approvals/${id}`] as const,
-  },
-
   // Datasets
   datasets: {
     all: (datasourceId: string) =>
diff --git a/python-packages/dataing-ee/src/dataing_ee/core/automation/executor.py b/python-packages/dataing-ee/src/dataing_ee/core/automation/executor.py
index 2b9ea842c..d9332eafc 100644
--- a/python-packages/dataing-ee/src/dataing_ee/core/automation/executor.py
+++ b/python-packages/dataing-ee/src/dataing_ee/core/automation/executor.py
@@ -4,16 +4,45 @@
 
 import logging
 from dataclasses import dataclass, field
-from typing import Any
+from typing import TYPE_CHECKING, Any
 from uuid import UUID
 
 from dataing.adapters.db.app_db import AppDatabase
+from dataing.core.domain_types import AnomalyAlert, MetricSpec
 from dataing.core.json_utils import to_json_string
 from dataing_ee.models.automation import ActionType
 
+if TYPE_CHECKING:
+    from dataing.services.investigation import InvestigationStarterService
+
 logger = logging.getLogger(__name__)
 
 
+def _issue_alert(issue_data: dict[str, Any], dataset_id: str) -> AnomalyAlert:
+    """Describe an issue as the AnomalyAlert its investigation runs on.
+
+    Issues carry no metric values, so the alert is a description-type metric
+    with zeroed values, dated when the issue was filed.
+    """
+    return AnomalyAlert(
+        dataset_ids=[dataset_id],
+        metric_spec=MetricSpec(
+            metric_type="description",
+            expression=issue_data.get("description") or issue_data["title"],
+            display_name=issue_data["title"],
+        ),
+        anomaly_type="custom",
+        expected_value=0.0,
+        actual_value=0.0,
+        deviation_pct=0.0,
+        anomaly_date=issue_data["created_at"].date().isoformat(),
+        severity=issue_data.get("severity") or "medium",
+        source_system=issue_data.get("source_provider"),
+        source_alert_id=issue_data.get("source_external_id"),
+        source_url=issue_data.get("source_external_url"),
+    )
+
+
 @dataclass
 class ActionResult:
     """Result of executing an action."""
@@ -32,6 +61,7 @@ class ExecutionContext:
     tenant_id: UUID
     issue_id: UUID
     rule_id: UUID
+    investigation_starter: InvestigationStarterService
     dry_run: bool = False
 
 
@@ -352,9 +382,14 @@ async def _spawn_investigation(
         """Spawn an investigation for the issue."""
         profile = params.get("profile", "standard")
 
-        # Check if investigation already exists
+        # Check if the issue already has an investigation
         existing = await ctx.db.fetch_one(
-            "SELECT id FROM investigations WHERE issue_id = $1 LIMIT 1",
+            """
+            SELECT investigation_id FROM issue_investigation_runs
+            WHERE issue_id = $1
+            ORDER BY created_at DESC
+            LIMIT 1
+            """,
             ctx.issue_id,
         )
 
@@ -363,44 +398,78 @@ async def _spawn_investigation(
                 action_type=ActionType.SPAWN_INVESTIGATION,
                 success=True,
                 result={
-                    "investigation_id": str(existing["id"]),
+                    "investigation_id": str(existing["investigation_id"]),
                     "already_exists": True,
                 },
             )
 
-        # Create investigation
-        row = await ctx.db.fetch_one(
-            """
-            INSERT INTO investigations (
-                tenant_id, issue_id, status, source, metadata
+        dataset_id = issue_data.get("dataset_id")
+        if not dataset_id:
+            return ActionResult(
+                action_type=ActionType.SPAWN_INVESTIGATION,
+                success=False,
+                error="Issue has no dataset_id to investigate",
             )
-            VALUES ($1, $2, 'pending', 'automation', $3)
-            RETURNING id
-            """,
-            ctx.tenant_id,
-            ctx.issue_id,
-            to_json_string({"profile": profile, "rule_id": str(ctx.rule_id)}),
-        )
 
-        if not row:
+        datasource_id = await self._resolve_datasource_id(params, ctx)
+        if datasource_id is None:
             return ActionResult(
                 action_type=ActionType.SPAWN_INVESTIGATION,
                 success=False,
-                error="Failed to create investigation",
+                error="No single datasource to investigate; set the datasource_id param",
             )
 
+        alert = _issue_alert(issue_data, dataset_id)
+        started = await ctx.investigation_starter.start_investigation(
+            tenant_id=ctx.tenant_id,
+            datasource_id=datasource_id,
+            alert_data=alert.model_dump(mode="json"),
+            alert_summary=f"Issue #{issue_data['number']} on {dataset_id}: {issue_data['title']}",
+        )
+
+        await ctx.db.execute(
+            """
+            INSERT INTO issue_investigation_runs (
+                issue_id, investigation_id, trigger_type, trigger_ref, execution_profile
+            )
+            VALUES ($1, $2, 'rule', $3, $4)
+            """,
+            ctx.issue_id,
+            started.investigation_id,
+            to_json_string({"rule_id": str(ctx.rule_id)}),
+            profile,
+        )
+
         await self._record_event(
             ctx,
             "investigation_started",
-            {"investigation_id": str(row["id"]), "source": "automation"},
+            {"investigation_id": str(started.investigation_id), "source": "automation"},
         )
 
         return ActionResult(
             action_type=ActionType.SPAWN_INVESTIGATION,
             success=True,
-            result={"investigation_id": str(row["id"])},
+            result={"investigation_id": str(started.investigation_id)},
         )
 
+    async def _resolve_datasource_id(
+        self,
+        params: dict[str, Any],
+        ctx: ExecutionContext,
+    ) -> UUID | None:
+        """Datasource named by the action params, else the tenant's only active one."""
+        if params.get("datasource_id"):
+            named_id = UUID(str(params["datasource_id"]))
+            if await ctx.db.get_data_source(named_id, ctx.tenant_id) is None:
+                return None
+            return named_id
+
+        active = await ctx.db.list_data_sources(ctx.tenant_id)
+        if len(active) != 1:
+            return None
+        only_id: UUID = active[0]["id"]
+        return only_id
+
     async def _notify(
         self,
         params: dict[str, Any],
diff --git a/python-packages/dataing-ee/tests/integration/conftest.py b/python-packages/dataing-ee/tests/integration/conftest.py
new file mode 100644
index 000000000..d392df625
--- /dev/null
+++ b/python-packages/dataing-ee/tests/integration/conftest.py
@@ -0,0 +1,18 @@
+"""Shared fixtures for EE integration tests.
+
+The migrated-database fixtures are defined once, in the CE integration conftest.
+Both packages have a `tests.integration` package, so that module cannot be
+imported by name; it is loaded from its path instead.
+"""
+
+import importlib.util
+from pathlib import Path
+
+_CE_CONFTEST = Path(__file__).resolve().parents[3] / "dataing/tests/integration/conftest.py"
+_spec = importlib.util.spec_from_file_location("dataing_ce_integration_conftest", _CE_CONFTEST)
+assert _spec is not None and _spec.loader is not None
+_ce_conftest = importlib.util.module_from_spec(_spec)
+_spec.loader.exec_module(_ce_conftest)
+
+migrated_dsn = _ce_conftest.migrated_dsn
+migrated_db = _ce_conftest.migrated_db
diff --git a/python-packages/dataing-ee/tests/integration/core/__init__.py b/python-packages/dataing-ee/tests/integration/core/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/python-packages/dataing-ee/tests/integration/core/automation/__init__.py b/python-packages/dataing-ee/tests/integration/core/automation/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/python-packages/dataing-ee/tests/integration/core/automation/test_spawn_investigation.py b/python-packages/dataing-ee/tests/integration/core/automation/test_spawn_investigation.py
new file mode 100644
index 000000000..5cfd9544a
--- /dev/null
+++ b/python-packages/dataing-ee/tests/integration/core/automation/test_spawn_investigation.py
@@ -0,0 +1,223 @@
+"""Integration tests for the spawn_investigation automation action on the migrated schema."""
+
+from __future__ import annotations
+
+import json
+from typing import Any
+from uuid import UUID, uuid4
+
+import pytest
+from dataing_ee.core.automation.executor import ActionExecutor, ActionResult, ExecutionContext
+
+from dataing.adapters.db.app_db import AppDatabase
+from dataing.core.domain_types import AnomalyAlert
+from dataing.services.investigation import InvestigationStarterService
+
+pytestmark = pytest.mark.integration
+
+RULE_ID = uuid4()
+
+
+class RecordingTemporalClient:
+    """Stands in for the Temporal server: records the workflows it is asked to start."""
+
+    def __init__(self) -> None:
+        self.started: list[dict[str, Any]] = []
+
+    async def start_investigation(self, **kwargs: Any) -> None:
+        self.started.append(kwargs)
+
+
+async def _create_tenant(db: AppDatabase) -> UUID:
+    tenant_id = uuid4()
+    await db.execute(
+        "INSERT INTO tenants (id, name, slug) VALUES ($1, $2, $3)",
+        tenant_id,
+        "Test Tenant",
+        f"test-{tenant_id.hex[:12]}",
+    )
+    return tenant_id
+
+
+async def _create_datasource(db: AppDatabase, tenant_id: UUID) -> UUID:
+    datasource_id = uuid4()
+    await db.execute(
+        """INSERT INTO data_sources (id, tenant_id, name, type, connection_config_encrypted)
+           VALUES ($1, $2, $3, 'postgresql', 'unused')""",
+        datasource_id,
+        tenant_id,
+        f"warehouse-{datasource_id.hex[:8]}",
+    )
+    return datasource_id
+
+
+async def _create_issue(
+    db: AppDatabase, tenant_id: UUID, *, dataset_id: str | None = "public.orders"
+) -> dict[str, Any]:
+    """Store an issue and return its row, the issue data a rule acts on."""
+    issue = await db.execute_returning(
+        """INSERT INTO issues (tenant_id, number, title, description, severity, dataset_id)
+           VALUES ($1, next_issue_number($1), $2, $3, 'high', $4)
+           RETURNING *""",
+        tenant_id,
+        "Null spike in orders.customer_id",
+        "customer_id is null on a quarter of today's orders",
+        dataset_id,
+    )
+    assert issue is not None
+    return issue
+
+
+async def _spawn(
+    db: AppDatabase,
+    issue: dict[str, Any],
+    temporal: RecordingTemporalClient,
+    params: dict[str, Any] | None = None,
+) -> ActionResult:
+    ctx = ExecutionContext(
+        db=db,
+        tenant_id=issue["tenant_id"],
+        issue_id=issue["id"],
+        rule_id=RULE_ID,
+        investigation_starter=InvestigationStarterService(db=db, temporal_client=temporal),
+    )
+    [result] = await ActionExecutor().execute_actions(
+        [{"type": "spawn_investigation", "params": params or {}}], ctx, issue
+    )
+    return result
+
+
+async def _investigation_count(db: AppDatabase, tenant_id: UUID) -> int:
+    row = await db.fetch_one(
+        "SELECT COUNT(*)::int AS count FROM investigations WHERE tenant_id = $1", tenant_id
+    )
+    assert row is not None
+    count: int = row["count"]
+    return count
+
+
+async def test_spawn_starts_an_investigation_on_a_valid_anomaly_alert(
+    migrated_db: AppDatabase,
+) -> None:
+    """The stored alert is an AnomalyAlert built from the issue, plus its datasource."""
+    tenant_id = await _create_tenant(migrated_db)
+    datasource_id = await _create_datasource(migrated_db, tenant_id)
+    issue = await _create_issue(migrated_db, tenant_id)
+    temporal = RecordingTemporalClient()
+
+    result = await _spawn(migrated_db, issue, temporal)
+
+    assert result.success, result.error
+    investigation_id = UUID(result.result["investigation_id"])
+    row = await migrated_db.fetch_one(
+        "SELECT tenant_id, alert, status FROM investigations WHERE id = $1", investigation_id
+    )
+    assert row is not None
+    assert (row["tenant_id"], row["status"]) == (tenant_id, "active")
+    alert_data = json.loads(row["alert"])
+    assert alert_data.pop("datasource_id") == str(datasource_id)
+    alert = AnomalyAlert.model_validate(alert_data)
+    assert alert.model_dump(mode="json") == alert_data
+    assert alert.dataset_ids == ["public.orders"]
+    assert alert.metric_spec.display_name == "Null spike in orders.customer_id"
+    assert alert.severity == "high"
+    assert alert.anomaly_date == issue["created_at"].date().isoformat()
+    assert [(w["investigation_id"], w["datasource_id"]) for w in temporal.started] == [
+        (str(investigation_id), str(datasource_id))
+    ]
+
+
+async def test_spawn_links_the_issue_and_reuses_its_investigation(
+    migrated_db: AppDatabase,
+) -> None:
+    """A rule firing again on the same issue does not start a second investigation."""
+    tenant_id = await _create_tenant(migrated_db)
+    await _create_datasource(migrated_db, tenant_id)
+    issue = await _create_issue(migrated_db, tenant_id)
+    temporal = RecordingTemporalClient()
+
+    first = await _spawn(migrated_db, issue, temporal, {"profile": "deep"})
+    second = await _spawn(migrated_db, issue, temporal, {"profile": "deep"})
+
+    assert first.success, first.error
+    investigation_id = first.result["investigation_id"]
+    assert second.success, second.error
+    assert second.result == {"investigation_id": investigation_id, "already_exists": True}
+    runs = await migrated_db.fetch_all(
+        """SELECT investigation_id, trigger_type, trigger_ref, execution_profile
+           FROM issue_investigation_runs WHERE issue_id = $1""",
+        issue["id"],
+    )
+    assert [
+        (
+            str(run["investigation_id"]),
+            run["trigger_type"],
+            json.loads(run["trigger_ref"]),
+            run["execution_profile"],
+        )
+        for run in runs
+    ] == [(investigation_id, "rule", {"rule_id": str(RULE_ID)}, "deep")]
+    assert len(temporal.started) == 1
+
+
+async def test_spawn_runs_against_the_datasource_the_rule_names(
+    migrated_db: AppDatabase,
+) -> None:
+    """With several datasources, the action's datasource_id param picks one."""
+    tenant_id = await _create_tenant(migrated_db)
+    await _create_datasource(migrated_db, tenant_id)
+    chosen = await _create_datasource(migrated_db, tenant_id)
+    issue = await _create_issue(migrated_db, tenant_id)
+    temporal = RecordingTemporalClient()
+
+    result = await _spawn(migrated_db, issue, temporal, {"datasource_id": str(chosen)})
+
+    assert result.success, result.error
+    assert [w["datasource_id"] for w in temporal.started] == [str(chosen)]
+
+
+async def test_spawn_fails_when_no_single_datasource_applies(migrated_db: AppDatabase) -> None:
+    """A tenant with several datasources needs the rule to name one."""
+    tenant_id = await _create_tenant(migrated_db)
+    await _create_datasource(migrated_db, tenant_id)
+    await _create_datasource(migrated_db, tenant_id)
+    issue = await _create_issue(migrated_db, tenant_id)
+    temporal = RecordingTemporalClient()
+
+    result = await _spawn(migrated_db, issue, temporal)
+
+    assert not result.success
+    assert "datasource" in (result.error or "")
+    assert temporal.started == []
+    assert await _investigation_count(migrated_db, tenant_id) == 0
+
+
+async def test_spawn_rejects_another_tenants_datasource(migrated_db: AppDatabase) -> None:
+    """A rule cannot point an investigation at a datasource outside its tenant."""
+    tenant_id = await _create_tenant(migrated_db)
+    await _create_datasource(migrated_db, tenant_id)
+    foreign = await _create_datasource(migrated_db, await _create_tenant(migrated_db))
+    issue = await _create_issue(migrated_db, tenant_id)
+    temporal = RecordingTemporalClient()
+
+    result = await _spawn(migrated_db, issue, temporal, {"datasource_id": str(foreign)})
+
+    assert not result.success
+    assert "datasource" in (result.error or "")
+    assert temporal.started == []
+    assert await _investigation_count(migrated_db, tenant_id) == 0
+
+
+async def test_spawn_fails_when_the_issue_has_no_dataset(migrated_db: AppDatabase) -> None:
+    """Investigations target a dataset; an issue without one cannot spawn."""
+    tenant_id = await _create_tenant(migrated_db)
+    await _create_datasource(migrated_db, tenant_id)
+    issue = await _create_issue(migrated_db, tenant_id, dataset_id=None)
+    temporal = RecordingTemporalClient()
+
+    result = await _spawn(migrated_db, issue, temporal)
+
+    assert not result.success
+    assert "dataset" in (result.error or "")
+    assert temporal.started == []
+    assert await _investigation_count(migrated_db, tenant_id) == 0
diff --git a/python-packages/dataing/openapi.json b/python-packages/dataing/openapi.json
index 588ee976f..dd0752797 100644
--- a/python-packages/dataing/openapi.json
+++ b/python-packages/dataing/openapi.json
@@ -3464,380 +3464,6 @@
         }
       }
     },
-    "/api/v1/approvals/pending": {
-      "get": {
-        "tags": [
-          "approvals"
-        ],
-        "summary": "List Pending Approvals",
-        "description": "List all pending approval requests for this tenant.",
-        "operationId": "list_pending_approvals_api_v1_approvals_pending_get",
-        "responses": {
-          "200": {
-            "description": "Successful Response",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/PendingApprovalsResponse"
-                }
-              }
-            }
-          }
-        },
-        "security": [
-          {
-            "APIKeyHeader": []
-          },
-          {
-            "HTTPBearer": []
-          }
-        ]
-      }
-    },
-    "/api/v1/approvals/{approval_id}": {
-      "get": {
-        "tags": [
-          "approvals"
-        ],
-        "summary": "Get Approval Request",
-        "description": "Get approval request details including context to review.",
-        "operationId": "get_approval_request_api_v1_approvals__approval_id__get",
-        "security": [
-          {
-            "APIKeyHeader": []
-          },
-          {
-            "HTTPBearer": []
-          }
-        ],
-        "parameters": [
-          {
-            "name": "approval_id",
-            "in": "path",
-            "required": true,
-            "schema": {
-              "type": "string",
-              "format": "uuid",
-              "title": "Approval Id"
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "Successful Response",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/ApprovalRequestResponse"
-                }
-              }
-            }
-          },
-          "422": {
-            "description": "Validation Error",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/HTTPValidationError"
-                }
-              }
-            }
-          }
-        }
-      }
-    },
-    "/api/v1/approvals/{approval_id}/approve": {
-      "post": {
-        "tags": [
-          "approvals"
-        ],
-        "summary": "Approve Request",
-        "description": "Approve an investigation to proceed.",
-        "operationId": "approve_request_api_v1_approvals__approval_id__approve_post",
-        "security": [
-          {
-            "APIKeyHeader": []
-          },
-          {
-            "HTTPBearer": []
-          }
-        ],
-        "parameters": [
-          {
-            "name": "approval_id",
-            "in": "path",
-            "required": true,
-            "schema": {
-              "type": "string",
-              "format": "uuid",
-              "title": "Approval Id"
-            }
-          }
-        ],
-        "requestBody": {
-          "required": true,
-          "content": {
-            "application/json": {
-              "schema": {
-                "$ref": "#/components/schemas/ApproveRequest"
-              }
-            }
-          }
-        },
-        "responses": {
-          "200": {
-            "description": "Successful Response",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/ApprovalDecisionResponse"
-                }
-              }
-            }
-          },
-          "422": {
-            "description": "Validation Error",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/HTTPValidationError"
-                }
-              }
-            }
-          }
-        }
-      }
-    },
-    "/api/v1/approvals/{approval_id}/reject": {
-      "post": {
-        "tags": [
-          "approvals"
-        ],
-        "summary": "Reject Request",
-        "description": "Reject an investigation.",
-        "operationId": "reject_request_api_v1_approvals__approval_id__reject_post",
-        "security": [
-          {
-            "APIKeyHeader": []
-          },
-          {
-            "HTTPBearer": []
-          }
-        ],
-        "parameters": [
-          {
-            "name": "approval_id",
-            "in": "path",
-            "required": true,
-            "schema": {
-              "type": "string",
-              "format": "uuid",
-              "title": "Approval Id"
-            }
-          }
-        ],
-        "requestBody": {
-          "required": true,
-          "content": {
-            "application/json": {
-              "schema": {
-                "$ref": "#/components/schemas/RejectRequest"
-              }
-            }
-          }
-        },
-        "responses": {
-          "200": {
-            "description": "Successful Response",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/ApprovalDecisionResponse"
-                }
-              }
-            }
-          },
-          "422": {
-            "description": "Validation Error",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/HTTPValidationError"
-                }
-              }
-            }
-          }
-        }
-      }
-    },
-    "/api/v1/approvals/{approval_id}/modify": {
-      "post": {
-        "tags": [
-          "approvals"
-        ],
-        "summary": "Modify And Approve",
-        "description": "Approve with modifications.\n\nThis allows reviewers to modify the investigation context before approving.\nFor example, they can adjust which tables are included, modify query limits, etc.",
-        "operationId": "modify_and_approve_api_v1_approvals__approval_id__modify_post",
-        "security": [
-          {
-            "APIKeyHeader": []
-          },
-          {
-            "HTTPBearer": []
-          }
-        ],
-        "parameters": [
-          {
-            "name": "approval_id",
-            "in": "path",
-            "required": true,
-            "schema": {
-              "type": "string",
-              "format": "uuid",
-              "title": "Approval Id"
-            }
-          }
-        ],
-        "requestBody": {
-          "required": true,
-          "content": {
-            "application/json": {
-              "schema": {
-                "$ref": "#/components/schemas/ModifyRequest"
-              }
-            }
-          }
-        },
-        "responses": {
-          "200": {
-            "description": "Successful Response",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/ApprovalDecisionResponse"
-                }
-              }
-            }
-          },
-          "422": {
-            "description": "Validation Error",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/HTTPValidationError"
-                }
-              }
-            }
-          }
-        }
-      }
-    },
-    "/api/v1/approvals/": {
-      "post": {
-        "tags": [
-          "approvals"
-        ],
-        "summary": "Create Approval Request",
-        "description": "Create a new approval request.\n\nThis is typically called by the system when an investigation reaches\na point requiring human review (e.g., context review before executing queries).",
-        "operationId": "create_approval_request_api_v1_approvals__post",
-        "requestBody": {
-          "content": {
-            "application/json": {
-              "schema": {
-                "$ref": "#/components/schemas/CreateApprovalRequest"
-              }
-            }
-          },
-          "required": true
-        },
-        "responses": {
-          "201": {
-            "description": "Successful Response",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/ApprovalRequestResponse"
-                }
-              }
-            }
-          },
-          "422": {
-            "description": "Validation Error",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/HTTPValidationError"
-                }
-              }
-            }
-          }
-        },
-        "security": [
-          {
-            "APIKeyHeader": []
-          },
-          {
-            "HTTPBearer": []
-          }
-        ]
-      }
-    },
-    "/api/v1/approvals/investigation/{investigation_id}": {
-      "get": {
-        "tags": [
-          "approvals"
-        ],
-        "summary": "Get Investigation Approvals",
-        "description": "Get all approval requests for a specific investigation.",
-        "operationId": "get_investigation_approvals_api_v1_approvals_investigation__investigation_id__get",
-        "security": [
-          {
-            "APIKeyHeader": []
-          },
-          {
-            "HTTPBearer": []
-          }
-        ],
-        "parameters": [
-          {
-            "name": "investigation_id",
-            "in": "path",
-            "required": true,
-            "schema": {
-              "type": "string",
-              "format": "uuid",
-              "title": "Investigation Id"
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "Successful Response",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "type": "array",
-                  "items": {
-                    "$ref": "#/components/schemas/ApprovalRequestResponse"
-                  },
-                  "title": "Response Get Investigation Approvals Api V1 Approvals Investigation  Investigation Id  Get"
-                }
-              }
-            }
-          },
-          "422": {
-            "description": "Validation Error",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/HTTPValidationError"
-                }
-              }
-            }
-          }
-        }
-      }
-    },
     "/api/v1/users/": {
       "get": {
         "tags": [
@@ -9468,202 +9094,6 @@
         "title": "AnomalySummary",
         "description": "Summary of detected anomaly."
       },
-      "ApprovalDecisionResponse": {
-        "properties": {
-          "id": {
-            "type": "string",
-            "title": "Id"
-          },
-          "investigation_id": {
-            "type": "string",
-            "title": "Investigation Id"
-          },
-          "decision": {
-            "type": "string",
-            "title": "Decision"
-          },
-          "decided_by": {
-            "type": "string",
-            "title": "Decided By"
-          },
-          "decided_at": {
-            "type": "string",
-            "format": "date-time",
-            "title": "Decided At"
-          },
-          "comment": {
-            "anyOf": [
-              {
-                "type": "string"
-              },
-              {
-                "type": "null"
-              }
-            ],
-            "title": "Comment"
-          }
-        },
-        "type": "object",
-        "required": [
-          "id",
-          "investigation_id",
-          "decision",
-          "decided_by",
-          "decided_at"
-        ],
-        "title": "ApprovalDecisionResponse",
-        "description": "Response for an approval decision."
-      },
-      "ApprovalRequestResponse": {
-        "properties": {
-          "id": {
-            "type": "string",
-            "title": "Id"
-          },
-          "investigation_id": {
-            "type": "string",
-            "title": "Investigation Id"
-          },
-          "request_type": {
-            "type": "string",
-            "title": "Request Type"
-          },
-          "context": {
-            "additionalProperties": true,
-            "type": "object",
-            "title": "Context"
-          },
-          "requested_at": {
-            "type": "string",
-            "format": "date-time",
-            "title": "Requested At"
-          },
-          "requested_by": {
-            "type": "string",
-            "title": "Requested By"
-          },
-          "decision": {
-            "anyOf": [
-              {
-                "type": "string"
-              },
-              {
-                "type": "null"
-              }
-            ],
-            "title": "Decision"
-          },
-          "decided_by": {
-            "anyOf": [
-              {
-                "type": "string"
-              },
-              {
-                "type": "null"
-              }
-            ],
-            "title": "Decided By"
-          },
-          "decided_at": {
-            "anyOf": [
-              {
-                "type": "string",
-                "format": "date-time"
-              },
-              {
-                "type": "null"
-              }
-            ],
-            "title": "Decided At"
-          },
-          "comment": {
-            "anyOf": [
-              {
-                "type": "string"
-              },
-              {
-                "type": "null"
-              }
-            ],
-            "title": "Comment"
-          },
-          "modifications": {
-            "anyOf": [
-              {
-                "additionalProperties": true,
-                "type": "object"
-              },
-              {
-                "type": "null"
-              }
-            ],
-            "title": "Modifications"
-          },
-          "dataset_id": {
-            "anyOf": [
-              {
-                "type": "string"
-              },
-              {
-                "type": "null"
-              }
-            ],
-            "title": "Dataset Id"
-          },
-          "metric_name": {
-            "anyOf": [
-              {
-                "type": "string"
-              },
-              {
-                "type": "null"
-              }
-            ],
-            "title": "Metric Name"
-          },
-          "severity": {
-            "anyOf": [
-              {
-                "type": "string"
-              },
-              {
-                "type": "null"
-              }
-            ],
-            "title": "Severity"
-          }
-        },
-        "type": "object",
-        "required": [
-          "id",
-          "investigation_id",
-          "request_type",
-          "context",
-          "requested_at",
-          "requested_by"
-        ],
-        "title": "ApprovalRequestResponse",
-        "description": "Response for an approval request."
-      },
-      "ApproveRequest": {
-        "properties": {
-          "comment": {
-            "anyOf": [
-              {
-                "type": "string",
-                "maxLength": 1000
-              },
-              {
-                "type": "null"
-              }
-            ],
-            "title": "Comment"
-          }
-        },
-        "type": "object",
-        "title": "ApproveRequest",
-        "description": "Request to approve an investigation."
-      },
       "AssetInstanceResult": {
         "properties": {
           "asset_urn": {
@@ -10416,33 +9846,6 @@
         "title": "ContextBundleResponse",
         "description": "Context bundle response."
       },
-      "CreateApprovalRequest": {
-        "properties": {
-          "investigation_id": {
-            "type": "string",
-            "format": "uuid",
-            "title": "Investigation Id"
-          },
-          "request_type": {
-            "type": "string",
-            "pattern": "^(context_review|query_approval|execution_approval)$",
-            "title": "Request Type"
-          },
-          "context": {
-            "additionalProperties": true,
-            "type": "object",
-            "title": "Context"
-          }
-        },
-        "type": "object",
-        "required": [
-          "investigation_id",
-          "request_type",
-          "context"
-        ],
-        "title": "CreateApprovalRequest",
-        "description": "Request to create a new approval request."
-      },
       "CreateBundleRequest": {
         "properties": {
           "assets": {
@@ -10727,18 +10130,13 @@
           "data_sources": {
             "type": "integer",
             "title": "Data Sources"
-          },
-          "pending_approvals": {
-            "type": "integer",
-            "title": "Pending Approvals"
           }
         },
         "type": "object",
         "required": [
           "active_investigations",
           "completed_today",
-          "data_sources",
-          "pending_approvals"
+          "data_sources"
         ],
         "title": "DashboardStats",
         "description": "Dashboard statistics."
@@ -13150,33 +12548,6 @@
         "title": "MatchedPatternResponse",
         "description": "A pattern that was matched during investigation."
       },
-      "ModifyRequest": {
-        "properties": {
-          "comment": {
-            "anyOf": [
-              {
-                "type": "string",
-                "maxLength": 1000
-              },
-              {
-                "type": "null"
-              }
-            ],
-            "title": "Comment"
-          },
-          "modifications": {
-            "additionalProperties": true,
-            "type": "object",
-            "title": "Modifications"
-          }
-        },
-        "type": "object",
-        "required": [
-          "modifications"
-        ],
-        "title": "ModifyRequest",
-        "description": "Request to approve with modifications."
-      },
       "NotificationListResponse": {
         "properties": {
           "items": {
@@ -13394,28 +12765,6 @@
         "title": "PasswordResetRequest",
         "description": "Password reset request body."
       },
-      "PendingApprovalsResponse": {
-        "properties": {
-          "approvals": {
-            "items": {
-              "$ref": "#/components/schemas/ApprovalRequestResponse"
-            },
-            "type": "array",
-            "title": "Approvals"
-          },
-          "total": {
-            "type": "integer",
-            "title": "Total"
-          }
-        },
-        "type": "object",
-        "required": [
-          "approvals",
-          "total"
-        ],
-        "title": "PendingApprovalsResponse",
-        "description": "Response for listing pending approvals."
-      },
       "PermissionGrantCreate": {
         "properties": {
           "grantee_type": {
@@ -13825,22 +13174,6 @@
         "title": "RegisterRequest",
         "description": "Registration request body."
       },
-      "RejectRequest": {
-        "properties": {
-          "reason": {
-            "type": "string",
-            "maxLength": 1000,
-            "minLength": 1,
-            "title": "Reason"
-          }
-        },
-        "type": "object",
-        "required": [
-          "reason"
-        ],
-        "title": "RejectRequest",
-        "description": "Request to reject an investigation."
-      },
       "RepoMappingListResponse": {
         "properties": {
           "items": {
diff --git a/python-packages/dataing/src/dataing/adapters/db/app_db.py b/python-packages/dataing/src/dataing/adapters/db/app_db.py
index cf03e55c5..5cde3b5a2 100644
--- a/python-packages/dataing/src/dataing/adapters/db/app_db.py
+++ b/python-packages/dataing/src/dataing/adapters/db/app_db.py
@@ -559,43 +559,6 @@ async def get_dataset_count(
         return result["count"] if result else 0
 
     # Investigation operations
-    async def create_investigation(
-        self,
-        tenant_id: UUID,
-        dataset_id: str,
-        metric_name: str,
-        data_source_id: UUID | None = None,
-        created_by: UUID | None = None,
-        expected_value: float | None = None,
-        actual_value: float | None = None,
-        deviation_pct: float | None = None,
-        anomaly_date: str | None = None,
-        severity: str | None = None,
-        metadata: dict[str, Any] | None = None,
-    ) -> dict[str, Any]:
-        """Create a new investigation."""
-        result = await self.execute_returning(
-            """INSERT INTO investigations
-               (tenant_id, data_source_id, created_by, dataset_id, metric_name,
-                expected_value, actual_value, deviation_pct, anomaly_date, severity, metadata)
-               VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11)
-               RETURNING *""",
-            tenant_id,
-            data_source_id,
-            created_by,
-            dataset_id,
-            metric_name,
-            expected_value,
-            actual_value,
-            deviation_pct,
-            anomaly_date,
-            severity,
-            to_json_string(metadata or {}),
-        )
-        if result is None:
-            raise RuntimeError("Failed to create investigation")
-        return result
-
     async def get_investigation(
         self, investigation_id: UUID, tenant_id: UUID
     ) -> dict[str, Any] | None:
@@ -661,51 +624,6 @@ async def list_investigations_for_dataset(
         """
         return await self.fetch_all(query, tenant_id, dataset_native_path, limit)
 
-    async def update_investigation_status(
-        self,
-        investigation_id: UUID,
-        status: str,
-        events: list[Any] | None = None,
-        finding: dict[str, Any] | None = None,
-        started_at: Any = None,
-        completed_at: Any = None,
-        duration_seconds: float | None = None,
-    ) -> dict[str, Any] | None:
-        """Update investigation status and optionally other fields."""
-        updates = ["status = $2"]
-        args: list[Any] = [investigation_id, status]
-        idx = 3
-
-        if events is not None:
-            updates.append(f"events = ${idx}")
-            args.append(to_json_string(events))
-            idx += 1
-
-        if finding is not None:
-            updates.append(f"finding = ${idx}")
-            args.append(to_json_string(finding))
-            idx += 1
-
-        if started_at is not None:
-            updates.append(f"started_at = ${idx}")
-            args.append(started_at)
-            idx += 1
-
-        if completed_at is not None:
-            updates.append(f"completed_at = ${idx}")
-            args.append(completed_at)
-            idx += 1
-
-        if duration_seconds is not None:
-            updates.append(f"duration_seconds = ${idx}")
-            args.append(duration_seconds)
-            idx += 1
-
-        query = f"""UPDATE investigations SET {", ".join(updates)}
-                    WHERE id = $1 RETURNING *"""
-
-        return await self.execute_returning(query, *args)
-
     # Audit log operations
     async def create_audit_log(
         self,
@@ -853,66 +771,6 @@ async def get_monthly_usage(
             month,
         )
 
-    # Approval requests
-    async def create_approval_request(
-        self,
-        investigation_id: UUID,
-        tenant_id: UUID,
-        request_type: str,
-        context: dict[str, Any],
-        requested_by: str = "system",
-    ) -> dict[str, Any]:
-        """Create an approval request."""
-        result = await self.execute_returning(
-            """INSERT INTO approval_requests
-                (investigation_id, tenant_id, request_type, context, requested_by)
-               VALUES ($1, $2, $3, $4, $5)
-               RETURNING *""",
-            investigation_id,
-            tenant_id,
-            request_type,
-            to_json_string(context),
-            requested_by,
-        )
-        if result is None:
-            raise RuntimeError("Failed to create approval request")
-        return result
-
-    async def get_pending_approvals(self, tenant_id: UUID) -> list[dict[str, Any]]:
-        """Get all pending approval requests for a tenant."""
-        return await self.fetch_all(
-            """SELECT ar.*, i.dataset_id, i.metric_name, i.severity
-               FROM approval_requests ar
-               JOIN investigations i ON i.id = ar.investigation_id
-               WHERE ar.tenant_id = $1 AND ar.decision IS NULL
-               ORDER BY ar.requested_at DESC""",
-            tenant_id,
-        )
-
-    async def make_approval_decision(
-        self,
-        approval_id: UUID,
-        tenant_id: UUID,
-        decision: str,
-        decided_by: UUID,
-        comment: str | None = None,
-        modifications: dict[str, Any] | None = None,
-    ) -> dict[str, Any] | None:
-        """Record an approval decision."""
-        return await self.execute_returning(
-            """UPDATE approval_requests
-               SET decision = $3, decided_by = $4, decided_at = NOW(),
-                   comment = $5, modifications = $6
-               WHERE id = $1 AND tenant_id = $2
-               RETURNING *""",
-            approval_id,
-            tenant_id,
-            decision,
-            decided_by,
-            comment,
-            to_json_string(modifications) if modifications else None,
-        )
-
     # Dashboard stats
     async def get_dashboard_stats(self, tenant_id: UUID) -> dict[str, Any]:
         """Get dashboard statistics for a tenant."""
@@ -938,18 +796,10 @@ async def get_dashboard_stats(self, tenant_id: UUID) -> dict[str, Any]:
             tenant_id,
         )
 
-        # Pending approvals
-        approvals_result = await self.fetch_one(
-            """SELECT COUNT(*) as count FROM approval_requests
-               WHERE tenant_id = $1 AND decision IS NULL""",
-            tenant_id,
-        )
-
         return {
             "activeInvestigations": active_result["count"] if active_result else 0,
             "completedToday": completed_result["count"] if completed_result else 0,
             "dataSources": ds_result["count"] if ds_result else 0,
-            "pendingApprovals": approvals_result["count"] if approvals_result else 0,
         }
 
     # Feedback event operations
diff --git a/python-packages/dataing/src/dataing/adapters/notifications/email.py b/python-packages/dataing/src/dataing/adapters/notifications/email.py
index 3a621256d..d4795fcf5 100644
--- a/python-packages/dataing/src/dataing/adapters/notifications/email.py
+++ b/python-packages/dataing/src/dataing/adapters/notifications/email.py
@@ -140,60 +140,6 @@ def send_investigation_completed(
 Summary:
 {summary}
 
----
-This email was sent by Dataing. Please do not reply to this email.
-        """
-
-        return self.send(to_emails, subject, body_html, body_text)
-
-    def send_approval_required(
-        self,
-        to_emails: list[str],
-        investigation_id: str,
-        approval_url: str,
-        context: dict[str, Any],
-    ) -> bool:
-        """Send approval request email."""
-        subject = f"Approval Required: Investigation {investigation_id}"
-
-        body_html = f"""
-        <html>
-        <body style="font-family: Arial, sans-serif; line-height: 1.6; color: #333;">
-            <h2 style="color: #ffc107;">Approval Required</h2>
-
-            <p>An investigation requires your approval to proceed.</p>
-
-            <p><strong>Investigation ID:</strong> {investigation_id}</p>
-
-            <div style="background: #fff3cd; padding: 15px; border-radius: 5px; margin: 20px 0;">
-                <h3 style="margin-top: 0; color: #856404;">Context</h3>
-                <p>Please review the context and approve or reject this investigation.</p>
-            </div>
-
-            <p style="text-align: center; margin: 30px 0;">
-                <a href="{approval_url}" style="background: #007bff; color: white;
-                padding: 12px 24px; text-decoration: none; border-radius: 5px; font-weight: bold;">
-                    Review and Approve
-                </a>
-            </p>
-
-            <hr style="border: none; border-top: 1px solid #ddd; margin: 30px 0;">
-            <p style="color: #666; font-size: 12px;">
-                This email was sent by Dataing. Please do not reply to this email.
-            </p>
-        </body>
-        </html>
-        """
-
-        body_text = f"""
-Approval Required
-
-An investigation requires your approval to proceed.
-
-Investigation ID: {investigation_id}
-
-Please review and approve at: {approval_url}
-
 ---
 This email was sent by Dataing. Please do not reply to this email.
         """
diff --git a/python-packages/dataing/src/dataing/adapters/notifications/slack.py b/python-packages/dataing/src/dataing/adapters/notifications/slack.py
index 122f6715f..62d9bbf07 100644
--- a/python-packages/dataing/src/dataing/adapters/notifications/slack.py
+++ b/python-packages/dataing/src/dataing/adapters/notifications/slack.py
@@ -1,6 +1,5 @@
 """Slack notification adapter."""
 
-import json
 from dataclasses import dataclass
 from typing import Any
 
@@ -129,25 +128,6 @@ def _build_message(
                 }
             )
 
-        elif event_type == "approval.required":
-            attachment["pretext"] = ":eyes: Approval Required"
-            fields.append(
-                {
-                    "title": "Investigation ID",
-                    "value": payload.get("investigation_id", "Unknown"),
-                    "short": True,
-                }
-            )
-            context = payload.get("context", {})
-            if context:
-                fields.append(
-                    {
-                        "title": "Context",
-                        "value": json.dumps(context, indent=2)[:500],
-                        "short": False,
-                    }
-                )
-
         else:
             # Generic event
             attachment["pretext"] = f":bell: {event_type}"
@@ -178,6 +158,5 @@ def _get_color_for_event(self, event_type: str) -> str:
             "investigation.completed": "#36a64f",  # Green
             "investigation.failed": "#dc3545",  # Red
             "investigation.started": "#007bff",  # Blue
-            "approval.required": "#ffc107",  # Yellow
         }
         return colors.get(event_type, "#6c757d")  # Gray default
diff --git a/python-packages/dataing/src/dataing/entrypoints/api/routes/__init__.py b/python-packages/dataing/src/dataing/entrypoints/api/routes/__init__.py
index f6265c393..fe0ff95a9 100644
--- a/python-packages/dataing/src/dataing/entrypoints/api/routes/__init__.py
+++ b/python-packages/dataing/src/dataing/entrypoints/api/routes/__init__.py
@@ -6,7 +6,6 @@
 from fastapi import APIRouter
 
 from dataing.entrypoints.api.routes.analytics import router as analytics_router
-from dataing.entrypoints.api.routes.approvals import router as approvals_router
 from dataing.entrypoints.api.routes.asset_instances import router as asset_instances_router
 from dataing.entrypoints.api.routes.auth import router as auth_router
 from dataing.entrypoints.api.routes.bundles import router as bundles_router
@@ -62,7 +61,6 @@
 api_router.include_router(datasources_v2_router, prefix="/v2")  # New unified adapter API
 api_router.include_router(credentials_router)  # User datasource credentials
 api_router.include_router(datasets_router)
-api_router.include_router(approvals_router)
 api_router.include_router(users_router)
 api_router.include_router(dashboard_router)
 api_router.include_router(usage_router)
diff --git a/python-packages/dataing/src/dataing/entrypoints/api/routes/approvals.py b/python-packages/dataing/src/dataing/entrypoints/api/routes/approvals.py
deleted file mode 100644
index 6a97b991a..000000000
--- a/python-packages/dataing/src/dataing/entrypoints/api/routes/approvals.py
+++ /dev/null
@@ -1,361 +0,0 @@
-"""Human-in-the-loop approval routes."""
-
-from __future__ import annotations
-
-from datetime import datetime
-from typing import Annotated, Any
-from uuid import UUID
-
-from fastapi import APIRouter, BackgroundTasks, Depends, HTTPException, Request
-from pydantic import BaseModel, Field
-
-from dataing.adapters.audit import audited
-from dataing.adapters.db.app_db import AppDatabase
-from dataing.entrypoints.api.deps import get_app_db
-from dataing.entrypoints.api.middleware.auth import ApiKeyContext, require_scope, verify_api_key
-
-router = APIRouter(prefix="/approvals", tags=["approvals"])
-
-# Annotated types for dependency injection
-AppDbDep = Annotated[AppDatabase, Depends(get_app_db)]
-AuthDep = Annotated[ApiKeyContext, Depends(verify_api_key)]
-WriteScopeDep = Annotated[ApiKeyContext, Depends(require_scope("write"))]
-
-
-class ApprovalRequestResponse(BaseModel):
-    """Response for an approval request."""
-
-    id: str
-    investigation_id: str
-    request_type: str
-    context: dict[str, Any]
-    requested_at: datetime
-    requested_by: str
-    decision: str | None = None
-    decided_by: str | None = None
-    decided_at: datetime | None = None
-    comment: str | None = None
-    modifications: dict[str, Any] | None = None
-    # Additional investigation context
-    dataset_id: str | None = None
-    metric_name: str | None = None
-    severity: str | None = None
-
-
-class PendingApprovalsResponse(BaseModel):
-    """Response for listing pending approvals."""
-
-    approvals: list[ApprovalRequestResponse]
-    total: int
-
-
-class ApproveRequest(BaseModel):
-    """Request to approve an investigation."""
-
-    comment: str | None = Field(None, max_length=1000)
-
-
-class RejectRequest(BaseModel):
-    """Request to reject an investigation."""
-
-    reason: str = Field(..., min_length=1, max_length=1000)
-
-
-class ModifyRequest(BaseModel):
-    """Request to approve with modifications."""
-
-    comment: str | None = Field(None, max_length=1000)
-    modifications: dict[str, Any] = Field(...)
-
-
-class ApprovalDecisionResponse(BaseModel):
-    """Response for an approval decision."""
-
-    id: str
-    investigation_id: str
-    decision: str
-    decided_by: str
-    decided_at: datetime
-    comment: str | None = None
-
-
-class CreateApprovalRequest(BaseModel):
-    """Request to create a new approval request."""
-
-    investigation_id: UUID
-    request_type: str = Field(..., pattern="^(context_review|query_approval|execution_approval)$")
-    context: dict[str, Any] = Field(...)
-
-
-@router.get("/pending", response_model=PendingApprovalsResponse)
-async def list_pending_approvals(
-    auth: AuthDep,
-    app_db: AppDbDep,
-) -> PendingApprovalsResponse:
-    """List all pending approval requests for this tenant."""
-    approvals = await app_db.get_pending_approvals(auth.tenant_id)
-
-    return PendingApprovalsResponse(
-        approvals=[
-            ApprovalRequestResponse(
-                id=str(a["id"]),
-                investigation_id=str(a["investigation_id"]),
-                request_type=a["request_type"],
-                context=a["context"] if isinstance(a["context"], dict) else {},
-                requested_at=a["requested_at"],
-                requested_by=a["requested_by"],
-                decision=a.get("decision"),
-                decided_by=str(a["decided_by"]) if a.get("decided_by") else None,
-                decided_at=a.get("decided_at"),
-                comment=a.get("comment"),
-                modifications=a.get("modifications"),
-                dataset_id=a.get("dataset_id"),
-                metric_name=a.get("metric_name"),
-                severity=a.get("severity"),
-            )
-            for a in approvals
-        ],
-        total=len(approvals),
-    )
-
-
-@router.get("/{approval_id}", response_model=ApprovalRequestResponse)
-async def get_approval_request(
-    approval_id: UUID,
-    auth: AuthDep,
-    app_db: AppDbDep,
-) -> ApprovalRequestResponse:
-    """Get approval request details including context to review."""
-    # Get all pending approvals and find the one with matching ID
-    approvals = await app_db.get_pending_approvals(auth.tenant_id)
-    approval = next((a for a in approvals if str(a["id"]) == str(approval_id)), None)
-
-    if not approval:
-        # Also check completed approvals
-        result = await app_db.fetch_one(
-            """SELECT ar.*, i.dataset_id, i.metric_name, i.severity
-               FROM approval_requests ar
-               JOIN investigations i ON i.id = ar.investigation_id
-               WHERE ar.id = $1 AND ar.tenant_id = $2""",
-            approval_id,
-            auth.tenant_id,
-        )
-        if not result:
-            raise HTTPException(status_code=404, detail="Approval request not found")
-        approval = result
-
-    return ApprovalRequestResponse(
-        id=str(approval["id"]),
-        investigation_id=str(approval["investigation_id"]),
-        request_type=approval["request_type"],
-        context=approval["context"] if isinstance(approval["context"], dict) else {},
-        requested_at=approval["requested_at"],
-        requested_by=approval["requested_by"],
-        decision=approval.get("decision"),
-        decided_by=str(approval["decided_by"]) if approval.get("decided_by") else None,
-        decided_at=approval.get("decided_at"),
-        comment=approval.get("comment"),
-        modifications=approval.get("modifications"),
-        dataset_id=approval.get("dataset_id"),
-        metric_name=approval.get("metric_name"),
-        severity=approval.get("severity"),
-    )
-
-
-@router.post("/{approval_id}/approve", response_model=ApprovalDecisionResponse)
-@audited(action="approval.approve", resource_type="approval")
-async def approve_request(
-    http_request: Request,
-    approval_id: UUID,
-    request: ApproveRequest,
-    background_tasks: BackgroundTasks,
-    auth: WriteScopeDep,
-    app_db: AppDbDep,
-) -> ApprovalDecisionResponse:
-    """Approve an investigation to proceed."""
-    user_id = auth.user_id or auth.key_id
-
-    result = await app_db.make_approval_decision(
-        approval_id=approval_id,
-        tenant_id=auth.tenant_id,
-        decision="approved",
-        decided_by=user_id,
-        comment=request.comment,
-    )
-
-    if not result:
-        raise HTTPException(status_code=404, detail="Approval request not found")
-
-    # TODO: Resume investigation in background
-    # background_tasks.add_task(resume_investigation, result["investigation_id"])
-
-    return ApprovalDecisionResponse(
-        id=str(result["id"]),
-        investigation_id=str(result["investigation_id"]),
-        decision="approved",
-        decided_by=str(user_id),
-        decided_at=result["decided_at"],
-        comment=result.get("comment"),
-    )
-
-
-@router.post("/{approval_id}/reject", response_model=ApprovalDecisionResponse)
-@audited(action="approval.reject", resource_type="approval")
-async def reject_request(
-    http_request: Request,
-    approval_id: UUID,
-    request: RejectRequest,
-    auth: WriteScopeDep,
-    app_db: AppDbDep,
-) -> ApprovalDecisionResponse:
-    """Reject an investigation."""
-    user_id = auth.user_id or auth.key_id
-
-    result = await app_db.make_approval_decision(
-        approval_id=approval_id,
-        tenant_id=auth.tenant_id,
-        decision="rejected",
-        decided_by=user_id,
-        comment=request.reason,
-    )
-
-    if not result:
-        raise HTTPException(status_code=404, detail="Approval request not found")
-
-    # Update investigation status to cancelled
-    await app_db.update_investigation_status(
-        result["investigation_id"],
-        status="cancelled",
-    )
-
-    return ApprovalDecisionResponse(
-        id=str(result["id"]),
-        investigation_id=str(result["investigation_id"]),
-        decision="rejected",
-        decided_by=str(user_id),
-        decided_at=result["decided_at"],
-        comment=request.reason,
-    )
-
-
-@router.post("/{approval_id}/modify", response_model=ApprovalDecisionResponse)
-@audited(action="approval.modify", resource_type="approval")
-async def modify_and_approve(
-    http_request: Request,
-    approval_id: UUID,
-    request: ModifyRequest,
-    background_tasks: BackgroundTasks,
-    auth: WriteScopeDep,
-    app_db: AppDbDep,
-) -> ApprovalDecisionResponse:
-    """Approve with modifications.
-
-    This allows reviewers to modify the investigation context before approving.
-    For example, they can adjust which tables are included, modify query limits, etc.
-    """
-    user_id = auth.user_id or auth.key_id
-
-    result = await app_db.make_approval_decision(
-        approval_id=approval_id,
-        tenant_id=auth.tenant_id,
-        decision="modified",
-        decided_by=user_id,
-        comment=request.comment,
-        modifications=request.modifications,
-    )
-
-    if not result:
-        raise HTTPException(status_code=404, detail="Approval request not found")
-
-    # TODO: Resume investigation with modifications
-    # investigation_id = result["investigation_id"]
-    # background_tasks.add_task(resume_investigation, investigation_id, request.modifications)
-
-    return ApprovalDecisionResponse(
-        id=str(result["id"]),
-        investigation_id=str(result["investigation_id"]),
-        decision="modified",
-        decided_by=str(user_id),
-        decided_at=result["decided_at"],
-        comment=result.get("comment"),
-    )
-
-
-@router.post("/", response_model=ApprovalRequestResponse, status_code=201)
-@audited(action="approval.create", resource_type="approval")
-async def create_approval_request(
-    http_request: Request,
-    request: CreateApprovalRequest,
-    auth: WriteScopeDep,
-    app_db: AppDbDep,
-) -> ApprovalRequestResponse:
-    """Create a new approval request.
-
-    This is typically called by the system when an investigation reaches
-    a point requiring human review (e.g., context review before executing queries).
-    """
-    # Verify investigation exists and belongs to tenant
-    investigation = await app_db.get_investigation(request.investigation_id, auth.tenant_id)
-    if not investigation:
-        raise HTTPException(status_code=404, detail="Investigation not found")
-
-    result = await app_db.create_approval_request(
-        investigation_id=request.investigation_id,
-        tenant_id=auth.tenant_id,
-        request_type=request.request_type,
-        context=request.context,
-        requested_by="system",
-    )
-
-    return ApprovalRequestResponse(
-        id=str(result["id"]),
-        investigation_id=str(result["investigation_id"]),
-        request_type=result["request_type"],
-        context=result["context"] if isinstance(result["context"], dict) else {},
-        requested_at=result["requested_at"],
-        requested_by=result["requested_by"],
-        dataset_id=investigation.get("dataset_id"),
-        metric_name=investigation.get("metric_name"),
-        severity=investigation.get("severity"),
-    )
-
-
-@router.get("/investigation/{investigation_id}", response_model=list[ApprovalRequestResponse])
-async def get_investigation_approvals(
-    investigation_id: UUID,
-    auth: AuthDep,
-    app_db: AppDbDep,
-) -> list[ApprovalRequestResponse]:
-    """Get all approval requests for a specific investigation."""
-    # Verify investigation exists and belongs to tenant
-    investigation = await app_db.get_investigation(investigation_id, auth.tenant_id)
-    if not investigation:
-        raise HTTPException(status_code=404, detail="Investigation not found")
-
-    results = await app_db.fetch_all(
-        """SELECT * FROM approval_requests
-           WHERE investigation_id = $1 AND tenant_id = $2
-           ORDER BY requested_at DESC""",
-        investigation_id,
-        auth.tenant_id,
-    )
-
-    return [
-        ApprovalRequestResponse(
-            id=str(a["id"]),
-            investigation_id=str(a["investigation_id"]),
-            request_type=a["request_type"],
-            context=a["context"] if isinstance(a["context"], dict) else {},
-            requested_at=a["requested_at"],
-            requested_by=a["requested_by"],
-            decision=a.get("decision"),
-            decided_by=str(a["decided_by"]) if a.get("decided_by") else None,
-            decided_at=a.get("decided_at"),
-            comment=a.get("comment"),
-            modifications=a.get("modifications"),
-            dataset_id=investigation.get("dataset_id"),
-            metric_name=investigation.get("metric_name"),
-            severity=investigation.get("severity"),
-        )
-        for a in results
-    ]
diff --git a/python-packages/dataing/src/dataing/entrypoints/api/routes/dashboard.py b/python-packages/dataing/src/dataing/entrypoints/api/routes/dashboard.py
index bd70a9eb0..e4e781579 100644
--- a/python-packages/dataing/src/dataing/entrypoints/api/routes/dashboard.py
+++ b/python-packages/dataing/src/dataing/entrypoints/api/routes/dashboard.py
@@ -25,7 +25,6 @@ class DashboardStats(BaseModel):
     active_investigations: int
     completed_today: int
     data_sources: int
-    pending_approvals: int
 
 
 class RecentInvestigation(BaseModel):
@@ -63,7 +62,6 @@ async def get_dashboard(
             active_investigations=stats["activeInvestigations"],
             completed_today=stats["completedToday"],
             data_sources=stats["dataSources"],
-            pending_approvals=stats["pendingApprovals"],
         ),
         recent_investigations=[
             RecentInvestigation(
@@ -91,5 +89,4 @@ async def get_stats(
         active_investigations=stats["activeInvestigations"],
         completed_today=stats["completedToday"],
         data_sources=stats["dataSources"],
-        pending_approvals=stats["pendingApprovals"],
     )
diff --git a/python-packages/dataing/src/dataing/entrypoints/api/routes/investigations.py b/python-packages/dataing/src/dataing/entrypoints/api/routes/investigations.py
index d6b19d26f..53dfd4c8e 100644
--- a/python-packages/dataing/src/dataing/entrypoints/api/routes/investigations.py
+++ b/python-packages/dataing/src/dataing/entrypoints/api/routes/investigations.py
@@ -1648,8 +1648,7 @@ async def export_snapshot_archive(
     except SnapshotSizeExceededError as e:
         raise HTTPException(
             status_code=413,
-            detail=f"Snapshot too large: {e.actual_size:,} bytes exceeds "
-            f"{e.max_size:,} byte limit",
+            detail=f"Snapshot too large: {e.actual_size:,} bytes exceeds {e.max_size:,} byte limit",
         ) from e
     except Exception as e:
         logger.error(f"Failed to build snapshot archive: {e}")
@@ -1748,11 +1747,11 @@ async def import_snapshot_archive(
             new_investigation_id = uuid4()
             original_id = metadata.investigation_id
 
-            # Store in database with replay flag
+            # Store in database with replay flag; status is generated from outcome
             await db.execute(
                 """
-                INSERT INTO investigations (id, tenant_id, alert, outcome, status)
-                VALUES ($1, $2, $3, $4, $5)
+                INSERT INTO investigations (id, tenant_id, alert, outcome)
+                VALUES ($1, $2, $3, $4)
                 """,
                 new_investigation_id,
                 auth.tenant_id,
@@ -1768,7 +1767,6 @@ async def import_snapshot_archive(
                         "schema_version": metadata.schema_version,
                     }
                 ),
-                "imported",
             )
 
             # TODO: Import evidence items from archive
diff --git a/python-packages/dataing/src/dataing/services/notification.py b/python-packages/dataing/src/dataing/services/notification.py
index 08aca61fa..a92cddafe 100644
--- a/python-packages/dataing/src/dataing/services/notification.py
+++ b/python-packages/dataing/src/dataing/services/notification.py
@@ -157,23 +157,3 @@ async def notify_investigation_failed(
                 },
             )
         )
-
-    async def notify_approval_required(
-        self,
-        tenant_id: UUID,
-        investigation_id: UUID,
-        approval_request_id: UUID,
-        context: dict[str, Any],
-    ) -> dict[str, Any]:
-        """Convenience method for approval request notifications."""
-        return await self.notify(
-            NotificationEvent(
-                event_type="approval.required",
-                tenant_id=tenant_id,
-                payload={
-                    "investigation_id": str(investigation_id),
-                    "approval_request_id": str(approval_request_id),
-                    "context": context,
-                },
-            )
-        )
diff --git a/python-packages/dataing/tests/integration/api/test_investigation_snapshot_import.py b/python-packages/dataing/tests/integration/api/test_investigation_snapshot_import.py
new file mode 100644
index 000000000..027933712
--- /dev/null
+++ b/python-packages/dataing/tests/integration/api/test_investigation_snapshot_import.py
@@ -0,0 +1,91 @@
+"""Integration tests for POST /investigations/import on the migrated schema."""
+
+from __future__ import annotations
+
+import json
+import shutil
+from uuid import UUID, uuid4
+
+import httpx
+import pytest
+from fastapi import FastAPI
+
+from dataing.adapters.db.app_db import AppDatabase
+from dataing.core.snapshot_builder import SnapshotBuilder
+from dataing.entrypoints.api.middleware.auth import ApiKeyContext, verify_api_key
+from dataing.entrypoints.api.routes.investigations import get_app_db, router
+
+pytestmark = pytest.mark.integration
+
+
+async def _create_tenant(db: AppDatabase) -> UUID:
+    tenant_id = uuid4()
+    await db.execute(
+        "INSERT INTO tenants (id, name, slug) VALUES ($1, $2, $3)",
+        tenant_id,
+        "Test Tenant",
+        f"test-{tenant_id.hex[:12]}",
+    )
+    return tenant_id
+
+
+async def _export_archive(investigation_id: UUID, status: str) -> bytes:
+    """Build an archive the way GET /investigations/{id}/snapshot does."""
+    archive_path = await SnapshotBuilder(str(investigation_id)).build(
+        investigation_state={"status": status, "source_instance": None, "tenant_id": None},
+        evidence_items=[],
+    )
+    try:
+        return archive_path.read_bytes()
+    finally:
+        shutil.rmtree(archive_path.parent)
+
+
+async def _import_archive(db: AppDatabase, tenant_id: UUID, archive: bytes) -> httpx.Response:
+    app = FastAPI()
+    app.include_router(router, prefix="/api/v1")
+    app.dependency_overrides[get_app_db] = lambda: db
+    app.dependency_overrides[verify_api_key] = lambda: ApiKeyContext(
+        key_id=uuid4(),
+        tenant_id=tenant_id,
+        tenant_slug="test",
+        tenant_name="Test Tenant",
+        user_id=None,
+        scopes=["write"],
+    )
+    transport = httpx.ASGITransport(app=app)
+    async with httpx.AsyncClient(transport=transport, base_url="http://test") as client:
+        return await client.post(
+            "/api/v1/investigations/import",
+            files={"file": ("snapshot.tar.gz", archive, "application/gzip")},
+        )
+
+
+async def test_import_stores_the_archive_as_a_completed_replay(migrated_db: AppDatabase) -> None:
+    """An exported archive imports as a new, completed replay of the original."""
+    tenant_id = await _create_tenant(migrated_db)
+    original_id = uuid4()
+    archive = await _export_archive(original_id, status="completed")
+
+    response = await _import_archive(migrated_db, tenant_id, archive)
+
+    assert response.status_code == 200, response.text
+    body = response.json()
+    assert body == {
+        "investigation_id": body["investigation_id"],
+        "status": "imported",
+        "original_investigation_id": str(original_id),
+        "evidence_count": 0,
+        "is_replay": True,
+    }
+    row = await migrated_db.fetch_one(
+        "SELECT tenant_id, status, outcome FROM investigations WHERE id = $1",
+        UUID(body["investigation_id"]),
+    )
+    assert row is not None
+    assert row["tenant_id"] == tenant_id
+    assert row["status"] == "completed"
+    outcome = json.loads(row["outcome"])
+    assert outcome["status"] == "completed"
+    assert outcome["is_replay"] is True
+    assert outcome["original_investigation_id"] == str(original_id)
diff --git a/python-packages/dataing/tests/integration/conftest.py b/python-packages/dataing/tests/integration/conftest.py
index ef957b44c..24188b1cd 100644
--- a/python-packages/dataing/tests/integration/conftest.py
+++ b/python-packages/dataing/tests/integration/conftest.py
@@ -36,16 +36,24 @@ def migrated_dsn() -> Iterator[str]:
     infra/init-app-db.sh apply them (seed files skipped, statement errors do not
     stop a file), so tests see the schema the application actually runs on.
     The database is created on the server in DATABASE_URL and dropped afterwards.
+
+    Integration tests only run when selected with `-m integration`, so a missing
+    psql or database server fails them instead of skipping them: a skip would let
+    CI pass without testing anything.
     """
     psql = shutil.which("psql")
     if psql is None:
-        pytest.skip("psql is required to apply migrations")
+        pytest.fail("psql must be on PATH to apply migrations", pytrace=False)
 
     server_dsn = os.getenv("DATABASE_URL", DEFAULT_DATABASE_URL)
     database = f"dataing_test_{uuid4().hex[:12]}"
     created = _psql(psql, server_dsn, "--command", f'CREATE DATABASE "{database}"')
     if created.returncode != 0:
-        pytest.skip(f"Database not available: {created.stderr.strip()}")
+        pytest.fail(
+            f"Cannot create a test database on the DATABASE_URL server "
+            f"(run `just demo-infra` or set DATABASE_URL): {created.stderr.strip()}",
+            pytrace=False,
+        )
 
     dsn = urlsplit(server_dsn)._replace(path=f"/{database}").geturl()
     try:
diff --git a/python-packages/dataing/tests/unit/adapters/notifications/test_email.py b/python-packages/dataing/tests/unit/adapters/notifications/test_email.py
index b27c4f565..cea6d63c9 100644
--- a/python-packages/dataing/tests/unit/adapters/notifications/test_email.py
+++ b/python-packages/dataing/tests/unit/adapters/notifications/test_email.py
@@ -131,25 +131,6 @@ def test_send_investigation_completed(self, notifier: EmailNotifier) -> None:
             assert "Investigation Completed" in msg_str
             assert "inv-123" in msg_str
 
-    def test_send_approval_required(self, notifier: EmailNotifier) -> None:
-        """Test sending approval required email."""
-        mock_server = MagicMock()
-
-        with patch("smtplib.SMTP") as mock_smtp:
-            mock_smtp.return_value.__enter__.return_value = mock_server
-
-            result = notifier.send_approval_required(
-                to_emails=["admin@example.com"],
-                investigation_id="inv-456",
-                approval_url="https://app.example.com/approve/req-123",
-                context={"query": "SELECT 1"},
-            )
-
-            assert result is True
-            call_args = mock_server.sendmail.call_args
-            msg_str = call_args[0][2]
-            assert "Approval Required" in msg_str
-
 
 class TestEmailConfig:
     """Tests for EmailConfig."""
diff --git a/python-packages/dataing/tests/unit/adapters/notifications/test_slack.py b/python-packages/dataing/tests/unit/adapters/notifications/test_slack.py
index 8730e8808..cc1ab4492 100644
--- a/python-packages/dataing/tests/unit/adapters/notifications/test_slack.py
+++ b/python-packages/dataing/tests/unit/adapters/notifications/test_slack.py
@@ -112,20 +112,6 @@ def test_build_message_investigation_failed(
         assert message["attachments"][0]["color"] == "#dc3545"  # Red
         assert any(f["title"] == "Error" for f in message["attachments"][0]["fields"])
 
-    def test_build_message_approval_required(
-        self,
-        notifier: SlackNotifier,
-    ) -> None:
-        """Test message building for approval.required event."""
-        payload = {
-            "investigation_id": "inv-123",
-            "context": {"query": "SELECT 1"},
-        }
-
-        message = notifier._build_message("approval.required", payload)
-
-        assert message["attachments"][0]["color"] == "#ffc107"  # Yellow
-
     def test_build_message_generic_event(
         self,
         notifier: SlackNotifier,
@@ -143,7 +129,6 @@ def test_get_color_for_event(self, notifier: SlackNotifier) -> None:
         assert notifier._get_color_for_event("investigation.completed") == "#36a64f"
         assert notifier._get_color_for_event("investigation.failed") == "#dc3545"
         assert notifier._get_color_for_event("investigation.started") == "#007bff"
-        assert notifier._get_color_for_event("approval.required") == "#ffc107"
         assert notifier._get_color_for_event("unknown.event") == "#6c757d"
 
 
diff --git a/python-packages/dataing/tests/unit/entrypoints/api/routes/test_route_authorization.py b/python-packages/dataing/tests/unit/entrypoints/api/routes/test_route_authorization.py
index fd8609b05..a3d32f6f7 100644
--- a/python-packages/dataing/tests/unit/entrypoints/api/routes/test_route_authorization.py
+++ b/python-packages/dataing/tests/unit/entrypoints/api/routes/test_route_authorization.py
@@ -36,11 +36,6 @@
 POLICY: dict[tuple[str, str], str] = {
     # analytics.py: refreshes a materialized view shared by every tenant
     ("POST", "/analytics/refresh"): SCOPE_ADMIN,
-    # approvals.py
-    ("POST", "/approvals/"): SCOPE_WRITE,
-    ("POST", "/approvals/{approval_id}/approve"): SCOPE_WRITE,
-    ("POST", "/approvals/{approval_id}/modify"): SCOPE_WRITE,
-    ("POST", "/approvals/{approval_id}/reject"): SCOPE_WRITE,
     # auth.py: sign-in and account recovery
     ("POST", "/auth/login"): PUBLIC,
     ("POST", "/auth/password-reset/confirm"): PUBLIC,
diff --git a/python-packages/dataing/tests/unit/services/test_notification.py b/python-packages/dataing/tests/unit/services/test_notification.py
index 2e06d206c..3d023119f 100644
--- a/python-packages/dataing/tests/unit/services/test_notification.py
+++ b/python-packages/dataing/tests/unit/services/test_notification.py
@@ -148,26 +148,6 @@ async def test_notify_investigation_failed(
         call_args = mock_db.get_webhooks_for_event.call_args
         assert call_args[0][1] == "investigation.failed"
 
-    async def test_notify_approval_required(
-        self,
-        service: NotificationService,
-        tenant_id: uuid.UUID,
-        mock_db: AsyncMock,
-    ) -> None:
-        """Test convenience method for approval required."""
-        inv_id = uuid.uuid4()
-        approval_id = uuid.uuid4()
-
-        await service.notify_approval_required(
-            tenant_id=tenant_id,
-            investigation_id=inv_id,
-            approval_request_id=approval_id,
-            context={"query": "SELECT 1"},
-        )
-
-        call_args = mock_db.get_webhooks_for_event.call_args
-        assert call_args[0][1] == "approval.required"
-
 
 class TestNotificationEvent:
     """Tests for NotificationEvent."""