merge: propagate org-purge best-effort from feat/dashboard-agent-ui

Author: kathiekiwi

.server-changes/org-delete-agent-purge-best-effort.md

@@ -0,0 +1,6 @@
+---
+area: webapp
+type: fix
+---
+
+Deleting an organization now always succeeds, even if a temporary background hiccup prevents its agent chats from being cleaned up right away.

apps/webapp/app/services/deleteOrganization.server.ts

@@ -6,6 +6,7 @@ import { DeleteProjectService } from "./deleteProject.server";
 import { getCurrentPlan } from "./platform.v3.server";
 import { controlPlaneResolver } from "~/v3/runOpsMigration/controlPlaneResolver.server";
 import { commonWorker } from "~/v3/commonWorker.server";
+import { logger } from "./logger.server";
 
 export class DeleteOrganizationService {
   #prismaClient: PrismaClient;
@@ -90,10 +91,18 @@ export class DeleteOrganizationService {
 
     // Soft-delete the org's dashboard agent chats; retention purges them later. Enqueued,
     // not inline: the agent store is a separate database in cloud.
-    await commonWorker.enqueue({
-      id: `dashboardAgent.purgeOrganization:${organization.id}`,
-      job: "dashboardAgent.purgeOrganization",
-      payload: { organizationId: organization.id },
-    });
+    // Best-effort: a failed enqueue must not fail org deletion (the org is already deleted).
+    try {
+      await commonWorker.enqueue({
+        id: `dashboardAgent.purgeOrganization:${organization.id}`,
+        job: "dashboardAgent.purgeOrganization",
+        payload: { organizationId: organization.id },
+      });
+    } catch (error) {
+      logger.warn("Failed to enqueue dashboard agent purge for deleted organization", {
+        organizationId: organization.id,
+        error,
+      });
+    }
   }
 }