@agent-native/core-corpus 0.216.0 → 0.218.0

package/corpus/templates/content/actions/disconnect-content-database-source.ts

@@ -1,4 +1,4 @@
-import { defineAction } from "@agent-native/core/action";
+import { defineAction, fail } from "@agent-native/core/action";
 import { assertAccess } from "@agent-native/core/sharing";
 import { and, eq, inArray } from "drizzle-orm";
 import { z } from "zod";
@@ -9,6 +9,13 @@ import type {
   ContentDatabaseResponse,
   DisconnectContentDatabaseSourceRequest,
 } from "../shared/api.js";
+import {
+  builderExecutionPayloadReference,
+  cleanupBuilderPrivatePayload,
+  enqueueBuilderPrivatePayloadCleanup,
+  isBuilderPrivatePayloadBoundToSource,
+} from "./_builder-cms-blob-custody.js";
+import { isBuilderExecutionClaimStale } from "./_builder-cms-execution-lease.js";
 import { lockContentDatabaseMutation } from "./_content-database-mutation-lock.js";
 import {
   getExistingSource,
@@ -18,6 +25,7 @@ import { getContentDatabaseResponse } from "./_database-utils.js";
 
 async function deleteSourceRecords(databaseId: string, sourceId: string) {
   const db = getDb();
+  const deletedBlobReferences = new Set<string>();
   await db.transaction(async (tx) => {
     await lockContentDatabaseMutation(
       tx as unknown as ReturnType<typeof getDb>,
@@ -36,6 +44,35 @@ async function deleteSourceRecords(databaseId: string, sourceId: string) {
         ),
       );
     if (!source) return;
+    const candidateExecutions = await tx
+      .select({
+        id: schema.contentDatabaseSourceExecutions.id,
+        state: schema.contentDatabaseSourceExecutions.state,
+        updatedAt: schema.contentDatabaseSourceExecutions.updatedAt,
+      })
+      .from(schema.contentDatabaseSourceExecutions)
+      .where(
+        and(
+          eq(schema.contentDatabaseSourceExecutions.sourceId, sourceId),
+          inArray(schema.contentDatabaseSourceExecutions.state, [
+            "running",
+            "response_received",
+            "reconciliation_required",
+          ]),
+        ),
+      );
+    const now = new Date().toISOString();
+    const activeExecutions = candidateExecutions.filter(
+      (execution) =>
+        execution.state !== "running" ||
+        !isBuilderExecutionClaimStale(execution.updatedAt, now),
+    );
+    if (activeExecutions.length > 0) {
+      fail(
+        "Cannot disconnect this source while a Builder execution is running or awaiting reconciliation.",
+        { errorCode: "builder_execution_running", statusCode: 409 },
+      );
+    }
     if (source.sourceType === "github") {
       // Without the link, the pages are ordinary pages again and editable.
       await tx
@@ -64,8 +101,34 @@ async function deleteSourceRecords(databaseId: string, sourceId: string) {
       .delete(schema.contentDatabaseBodyHydrationQueue)
       .where(eq(schema.contentDatabaseBodyHydrationQueue.sourceId, sourceId));
     await tx
+      .delete(schema.contentDatabaseSourceExecutionClaims)
+      .where(
+        eq(schema.contentDatabaseSourceExecutionClaims.sourceId, sourceId),
+      );
+    const deletedExecutions = await tx
       .delete(schema.contentDatabaseSourceExecutions)
-      .where(eq(schema.contentDatabaseSourceExecutions.sourceId, sourceId));
+      .where(eq(schema.contentDatabaseSourceExecutions.sourceId, sourceId))
+      .returning({
+        ownerEmail: schema.contentDatabaseSourceExecutions.ownerEmail,
+        payloadJson: schema.contentDatabaseSourceExecutions.payloadJson,
+      });
+    for (const row of deletedExecutions) {
+      const reference = builderExecutionPayloadReference(row.payloadJson);
+      if (
+        reference &&
+        isBuilderPrivatePayloadBoundToSource(
+          reference,
+          row.ownerEmail,
+          sourceId,
+        )
+      ) {
+        deletedBlobReferences.add(reference);
+        await enqueueBuilderPrivatePayloadCleanup(
+          tx as unknown as ReturnType<typeof getDb>,
+          reference,
+        );
+      }
+    }
     await tx
       .delete(schema.contentDatabaseSourceChangeReviews)
       .where(eq(schema.contentDatabaseSourceChangeReviews.sourceId, sourceId));
@@ -82,6 +145,9 @@ async function deleteSourceRecords(databaseId: string, sourceId: string) {
       .delete(schema.contentDatabaseSources)
       .where(eq(schema.contentDatabaseSources.id, sourceId));
   });
+  for (const reference of deletedBlobReferences) {
+    await cleanupBuilderPrivatePayload(reference, "disconnected source");
+  }
 }
 
 export default defineAction({

package/corpus/templates/content/actions/disconnect-local-folder-source.ts

@@ -4,6 +4,12 @@ import { and, eq, inArray, ne } from "drizzle-orm";
 import { z } from "zod";
 
 import { getDb, schema } from "../server/db/index.js";
+import {
+  builderExecutionPayloadReference,
+  cleanupBuilderPrivatePayload,
+  enqueueBuilderPrivatePayloadCleanup,
+  isBuilderPrivatePayloadBoundToSource,
+} from "./_builder-cms-blob-custody.js";
 import { resolveContentSpaceAccess } from "./_content-space-access.js";
 import { LOCAL_FOLDER_SOURCE_TYPE } from "./_local-folder-source.js";
 
@@ -38,6 +44,7 @@ export default defineAction({
     const spaceId = target.database.spaceId;
     let disconnectedDocuments = 0;
     const now = new Date().toISOString();
+    const deletedBlobReferences = new Set<string>();
 
     await db.transaction(async (tx: any) => {
       const rows = await tx
@@ -48,9 +55,27 @@ export default defineAction({
         ...new Set<string>(rows.map((row: any) => String(row.documentId))),
       ];
       disconnectedDocuments = documentIds.length;
-      await tx
+      const deletedExecutions = await tx
         .delete(schema.contentDatabaseSourceExecutions)
-        .where(eq(schema.contentDatabaseSourceExecutions.sourceId, sourceId));
+        .where(eq(schema.contentDatabaseSourceExecutions.sourceId, sourceId))
+        .returning({
+          ownerEmail: schema.contentDatabaseSourceExecutions.ownerEmail,
+          payloadJson: schema.contentDatabaseSourceExecutions.payloadJson,
+        });
+      for (const row of deletedExecutions) {
+        const reference = builderExecutionPayloadReference(row.payloadJson);
+        if (
+          reference &&
+          isBuilderPrivatePayloadBoundToSource(
+            reference,
+            row.ownerEmail,
+            sourceId,
+          )
+        ) {
+          deletedBlobReferences.add(reference);
+          await enqueueBuilderPrivatePayloadCleanup(tx, reference);
+        }
+      }
       await tx
         .delete(schema.contentDatabaseSourceExecutionClaims)
         .where(
@@ -164,6 +189,12 @@ export default defineAction({
           );
       }
     });
+    for (const reference of deletedBlobReferences) {
+      await cleanupBuilderPrivatePayload(
+        reference,
+        "disconnected local folder source",
+      );
+    }
     await writeAppState("refresh-signal", { ts: Date.now() });
     return {
       success: true,