@cardinali-studio/adminkit 2.2.7 → 2.2.9

package/dist/deployment.d.ts

@@ -75,6 +75,7 @@ export declare class D1DeploymentAttemptRepository {
     fail(input: {
         attemptId: string;
         releaseId: string;
+        intentKind: DeploymentIntent;
         tokenChecksum: string;
         phase: DeploymentPhase;
         now: number;

package/dist/deployment.js

@@ -142,12 +142,22 @@ export class D1DeploymentAttemptRepository {
     async fail(input) {
         if (isTerminalDeploymentPhase(input.phase))
             throw new Error("invalid_attempt_transition");
-        const result = await this.db.prepare(`UPDATE production_deployment_attempts
-      SET phase = 'failed', active_slot = NULL, error_code = ?, error_stage = ?, safe_message = ?, updated_at = ?, finished_at = ?
-      WHERE attempt_id = ? AND release_id = ? AND phase = ? AND ci_claim_token_checksum = ? AND ci_claim_expires_at > ?`)
-            .bind(input.code, input.stage, input.message, input.now, input.now, input.attemptId, input.releaseId, input.phase, input.tokenChecksum, input.now).run();
-        if (result.meta?.changes !== 1)
+        const guard = `EXISTS (SELECT 1 FROM production_deployment_attempts WHERE attempt_id = ? AND release_id = ?
+      AND intent_kind = ? AND phase = ? AND ci_claim_token_checksum = ? AND ci_claim_expires_at > ?)`;
+        const results = await this.db.batch([
+            this.db.prepare(`UPDATE content_releases SET status = 'failed', active_slot = NULL, finished_at = ?
+        WHERE release_id = ? AND status = 'publishing' AND ? = 'content' AND ${guard}`)
+                .bind(input.now, input.releaseId, input.intentKind, input.attemptId, input.releaseId, input.intentKind, input.phase, input.tokenChecksum, input.now),
+            this.db.prepare(`UPDATE production_deployment_attempts
+        SET phase = 'failed', active_slot = NULL, error_code = ?, error_stage = ?, safe_message = ?, updated_at = ?, finished_at = ?
+        WHERE attempt_id = ? AND release_id = ? AND intent_kind = ? AND phase = ?
+          AND ci_claim_token_checksum = ? AND ci_claim_expires_at > ?`)
+                .bind(input.code, input.stage, input.message, input.now, input.now, input.attemptId, input.releaseId, input.intentKind, input.phase, input.tokenChecksum, input.now),
+        ]);
+        const expectedReleaseChanges = input.intentKind === "content" ? 1 : 0;
+        if (results[0]?.meta?.changes !== expectedReleaseChanges || results[1]?.meta?.changes !== 1) {
             throw new Error("attempt_unavailable");
+        }
     }
     /** Promotes the release and succeeds the exact verified attempt in one D1
      * batch. Every mutating statement repeats the capability guard, so a stale

package/dist/functions/api/content-ci.js

@@ -130,7 +130,7 @@ export async function handleInternalContentCi({ request, env }) {
     if (path === "/internal/deployment/fail" && request.method === "POST") {
       const detail = failure[input.code];
       if (!detail) throw new Error("invalid_request");
-      await attempts.fail({ ...identity, tokenChecksum: checksum, phase: attempt.phase, now, code: input.code, ...detail });
+      await attempts.fail({ ...identity, intentKind: attempt.intentKind, tokenChecksum: checksum, phase: attempt.phase, now, code: input.code, ...detail });
       return response({ ok: true, attempt: { ...identity, phase: "failed" } });
     }
     return safeError("invalid_request", "routing", 405);

package/dist/persistence.js

@@ -158,7 +158,10 @@ export class D1ContentRepository {
             return "repeated";
         if ((input.payload === null) === !input.tombstone)
             throw new Error("invalid_document");
-        const document = await this.db.prepare("SELECT document_id, draft_revision_id, abandoned_at FROM content_documents WHERE document_id = ?").bind(input.documentId).first();
+        /* `kind` and `locale` are part of the immutable identity check below, so
+         * they must be projected by the real D1 query. Test doubles used to return
+         * extra object properties and accidentally hid their absence in SQL. */
+        const document = await this.db.prepare("SELECT document_id, kind, locale, draft_revision_id, abandoned_at FROM content_documents WHERE document_id = ?").bind(input.documentId).first();
         if (document && (document.kind !== input.kind || document.locale !== input.locale))
             throw new Error("invalid_document");
         const expectedDraftRevisionId = input.expectedDraftRevisionId === undefined ? input.baseRevisionId : input.expectedDraftRevisionId;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cardinali-studio/adminkit",
-  "version": "2.2.7",
+  "version": "2.2.9",
   "type": "module",
   "description": "Motore riusabile di un pannello di amministrazione per siti Hugo su Cloudflare Pages: codec del front matter guidato dallo schema, form React, libreria media su R2. NIENTE di specifico di un sito qui dentro.",
   "license": "UNLICENSED",