fix(webapp,database): reactivate a re-declared webhook, keep operator disables

A webhook removed from the deploy manifest is deactivated by the declarative
sync. On a later deploy that re-declares it, the endpoint stayed INACTIVE and
silently dropped deliveries. A new WebhookEndpoint.manuallyDeactivatedAt
timestamp distinguishes an operator disable from that auto-deactivation: the
sync reactivates an auto-deactivated endpoint on re-declare, but leaves an
operator-disabled one alone. The disable and enable endpoints set and clear the
timestamp.

Author: ericallam

apps/webapp/app/routes/api.v1.webhooks.endpoints.$endpointId.disable.ts

@@ -25,7 +25,7 @@ const { action, loader } = createActionApiRoute(
 
     await webhookPrisma.webhookEndpoint.update({
       where: { id: endpoint.id },
-      data: { status: "INACTIVE" },
+      data: { status: "INACTIVE", manuallyDeactivatedAt: new Date() },
     });
     webhookEngine.invalidateEndpoint(endpoint.opaqueId);
 

apps/webapp/app/routes/api.v1.webhooks.endpoints.$endpointId.enable.ts

@@ -25,7 +25,7 @@ const { action, loader } = createActionApiRoute(
 
     await webhookPrisma.webhookEndpoint.update({
       where: { id: endpoint.id },
-      data: { status: "ACTIVE" },
+      data: { status: "ACTIVE", manuallyDeactivatedAt: null },
     });
     webhookEngine.invalidateEndpoint(endpoint.opaqueId);
 

apps/webapp/app/v3/services/createBackgroundWorker.server.ts

@@ -754,6 +754,7 @@ export async function syncDeclarativeWebhooks(
           verifierArtifact: wh.verifierArtifact as unknown as Prisma.InputJsonValue,
           secretProvisioning: wh.secretProvisioning ?? "either",
           metadata: (wh.metadata ?? {}) as unknown as Prisma.InputJsonValue,
+          ...(found.manuallyDeactivatedAt === null ? { status: "ACTIVE" as const } : {}),
           ...filterData,
         },
       });

apps/webapp/test/syncDeclarativeWebhooks.test.ts

@@ -64,7 +64,8 @@ async function seedEndpoint(
   prisma: PrismaClient,
   base: { organizationId: string; projectId: string; runtimeEnvironmentId: string },
   handlerWebhookId: string,
-  status: "ACTIVE" | "INACTIVE"
+  status: "ACTIVE" | "INACTIVE",
+  manuallyDeactivatedAt: Date | null = null
 ) {
   const suffix = Math.random().toString(36).slice(2, 10);
   return prisma.webhookEndpoint.create({
@@ -80,6 +81,7 @@ async function seedEndpoint(
       routingTarget: { type: "task", taskId: "handle-stripe" },
       verifierArtifact: { kind: "bundle", bundleUrl: "https://example.test/v.js", hash: "h" },
       status,
+      manuallyDeactivatedAt,
     },
   });
 }
@@ -154,7 +156,8 @@ describe("syncDeclarativeWebhooks status reconciliation", () => {
           runtimeEnvironmentId: environment.id,
         },
         "declared-webhook",
-        "INACTIVE"
+        "INACTIVE",
+        new Date()
       );
 
       await syncDeclarativeWebhooks(
@@ -167,6 +170,37 @@ describe("syncDeclarativeWebhooks status reconciliation", () => {
 
       const after = await prisma.webhookEndpoint.findUniqueOrThrow({ where: { id: endpoint.id } });
       expect(after.status).toBe("INACTIVE");
+      expect(after.manuallyDeactivatedAt).not.toBeNull();
+    }
+  );
+
+  containerTest(
+    "a redeploy re-activates an endpoint auto-deactivated when it was removed then re-declared",
+    async ({ prisma }) => {
+      const { organization, project, environment } = await seedProjectWithEnv(prisma);
+      const worker = await seedWorkerWithTask(prisma, project, environment, "handle-stripe");
+      const endpoint = await seedEndpoint(
+        prisma,
+        {
+          organizationId: organization.id,
+          projectId: project.id,
+          runtimeEnvironmentId: environment.id,
+        },
+        "declared-webhook",
+        "INACTIVE",
+        null
+      );
+
+      await syncDeclarativeWebhooks(
+        [makeWebhookResource("declared-webhook", "handle-stripe")],
+        worker,
+        asEnv(environment),
+        prisma,
+        prisma
+      );
+
+      const after = await prisma.webhookEndpoint.findUniqueOrThrow({ where: { id: endpoint.id } });
+      expect(after.status).toBe("ACTIVE");
     }
   );
 

internal-packages/database/prisma/migrations/20260809120000_add_webhook_endpoint_manually_deactivated_at/migration.sql

@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "public"."WebhookEndpoint" ADD COLUMN "manuallyDeactivatedAt" TIMESTAMP(3);

internal-packages/database/prisma/schema.prisma

@@ -799,6 +799,10 @@ model WebhookEndpoint {
   signingSecretKey String?
 
   status    WebhookEndpointStatus @default(ACTIVE)
+  /// When an operator disabled the endpoint via the dashboard/API. Null means the declarative sync
+  /// owns the status: a redeploy that re-declares a previously-removed (auto-deactivated) webhook
+  /// reactivates it. Non-null means the operator disabled it, so the sync leaves the status alone.
+  manuallyDeactivatedAt DateTime?
   createdAt DateTime              @default(now())
   updatedAt DateTime              @updatedAt