@frockbot/plugin-flock 0.3.14 → 0.3.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@frockbot/plugin-flock",
-  "version": "0.3.14",
+  "version": "0.3.15",
   "private": false,
   "type": "module",
   "exports": {
@@ -27,16 +27,16 @@
     "typecheck": "vue-tsc --noEmit -p tsconfig.json"
   },
   "dependencies": {
-    "@frockbot/client-core": "0.3.14",
-    "@frockbot/client-ui": "0.3.14",
-    "@frockbot/configuration-core": "0.3.14",
-    "@frockbot/kernel-contracts": "0.3.14",
-    "@frockbot/plugin-shell": "0.3.14",
+    "@frockbot/client-core": "0.3.15",
+    "@frockbot/client-ui": "0.3.15",
+    "@frockbot/configuration-core": "0.3.15",
+    "@frockbot/kernel-contracts": "0.3.15",
+    "@frockbot/plugin-shell": "0.3.15",
     "cordis": "4.0.0-rc.8",
     "vue": "3.5.41"
   },
   "devDependencies": {
-    "@frockbot/plugin-testkit": "0.3.14",
+    "@frockbot/plugin-testkit": "0.3.15",
     "@types/bun": "1.4.0",
     "@vitejs/plugin-vue": "6.0.8",
     "css-tree": "2.3.1",

package/src/bot.test.ts

@@ -49,7 +49,7 @@ describe("Flock Bot contribution", () => {
           return Promise.resolve();
         },
         archiveEligible: () => Promise.resolve(true),
-        tearDown: () => Promise.resolve(),
+        tearDown: () => Promise.resolve("complete"),
       });
     expect(await create().read(registration, "user-1")).toMatchObject({
       botId: "alpha",
@@ -96,7 +96,7 @@ describe("Flock Bot contribution", () => {
         storage,
         materializeSettings: () => Promise.resolve(),
         archiveEligible: () => Promise.resolve(eligible),
-        tearDown: () => Promise.resolve(),
+        tearDown: () => Promise.resolve("complete"),
       });
     const contribution = create();
     await contribution.read(registration, "user-1");
@@ -171,7 +171,7 @@ describe("Flock Bot contribution", () => {
           torn.push(identity);
           alarms = 0;
           storage.values.clear();
-          return Promise.resolve();
+          return Promise.resolve("complete" as const);
         },
       });
     const contribution = create();
@@ -237,13 +237,47 @@ describe("Flock Bot contribution", () => {
     );
   });
 
+  test("keeps deletion pending until the host has purged derived state", async () => {
+    const storage = new MemoryStorage();
+    const outcomes: Array<"pending" | "complete"> = ["pending", "complete"];
+    const contribution = createFlockBotBackendContribution({
+      storage,
+      materializeSettings: () => Promise.resolve(),
+      archiveEligible: () => Promise.resolve(true),
+      tearDown: () => Promise.resolve(outcomes.shift() ?? "complete"),
+    });
+    await contribution.read(registration, "user-1");
+    const command = {
+      schemaVersion: 1 as const,
+      type: "bot/delete" as const,
+      commandId: "delete-paged",
+      botId: "alpha",
+    };
+
+    expect(
+      await contribution.executeLifecycle(registration, "user-1", command),
+    ).toMatchObject({
+      status: "pending",
+      lifecycle: { status: "active" },
+    });
+    expect(
+      await contribution.readLifecycle(registration, "user-1"),
+    ).toMatchObject({ status: "active" });
+    expect(
+      await contribution.executeLifecycle(registration, "user-1", command),
+    ).toMatchObject({
+      status: "applied",
+      lifecycle: { status: "deleted" },
+    });
+  });
+
   test("rejects malformed durable sheep identity and receipt records", async () => {
     const storage = new MemoryStorage();
     const contribution = createFlockBotBackendContribution({
       storage,
       materializeSettings: () => Promise.resolve(),
       archiveEligible: () => Promise.resolve(true),
-      tearDown: () => Promise.resolve(),
+      tearDown: () => Promise.resolve("complete"),
     });
     await storage.put("flock:sheep:v1", {
       schemaVersion: 1,

package/src/bot.ts

@@ -52,7 +52,10 @@ export interface FlockBotBackendHost {
    * named here at all. It must be idempotent: the delete saga replays, and a
    * Bot torn down twice is torn down once.
    */
-  tearDown(identity: { userId: string; botId: string }): Promise<void>;
+  tearDown(identity: {
+    userId: string;
+    botId: string;
+  }): Promise<"complete" | "pending">;
 }
 
 export class BotArchivedError extends Error {
@@ -314,7 +317,26 @@ export class FlockBotBackendContribution {
         : decodeBotLifecycleViewV1(currentValue);
     if (current && current.botId !== registration.botId)
       throw new Error("Bot lifecycle identity does not match");
-    await this.host.tearDown({ userId, botId: registration.botId });
+    const teardown = await this.host.tearDown({
+      userId,
+      botId: registration.botId,
+    });
+    if (teardown === "pending") {
+      return decodeBotLifecycleReceiptV1({
+        schemaVersion: 1,
+        commandId: command.commandId,
+        botId: command.botId,
+        status: "pending",
+        lifecycle:
+          current ??
+          ({
+            schemaVersion: 1,
+            botId: command.botId,
+            status: "active",
+            revision: 0,
+          } satisfies BotLifecycleViewV1),
+      });
+    }
     const lifecycle = {
       schemaVersion: 1,
       botId: command.botId,