@adcp/sdk 14.0.0-beta.17 → 14.0.0-beta.19

package/dist/lib/server/decisioning/runtime/postgres-task-settlement.js

@@ -27,6 +27,7 @@ module.exports = __toCommonJS(postgres_task_settlement_exports);
 var import_node_crypto = require("node:crypto");
 var import_jcs = require('../../../utils/jcs.js');
 var import_adcp_version_config = require('../../../utils/adcp-version-config.js');
+var import_well_formed_unicode = require('../../../utils/well-formed-unicode.js');
 var import_errors = require('../../errors.js');
 var import_common = require('../../webhook-delivery/common.js');
 var import_recovery = require('../../webhook-delivery/recovery.js');
@@ -51,17 +52,20 @@ function createPostgresTaskSettlementCoordinator(options) {
       "Crash-safe task settlement requires a pg Pool with connect(); a query-only adapter cannot own a transaction"
     );
   }
-  if (typeof options.registry.registryId !== "string" || options.registry.registryId.length === 0) {
+  const registryId = options.registry.registryId;
+  if (typeof registryId !== "string" || registryId.length === 0) {
     throw new TypeError("Crash-safe task settlement requires task registry storageId/registryId binding");
   }
   if (typeof options.publisherScope !== "string" || options.publisherScope.length === 0) {
     throw new TypeError("publisherScope must be a non-empty string");
   }
+  (0, import_well_formed_unicode.assertWellFormedUnicode)(registryId, "Task settlement registryId");
+  (0, import_well_formed_unicode.assertWellFormedUnicode)(options.publisherScope, "Task settlement publisherScope");
   const outboxOptions = options.outbox ?? {};
   const outboxTable = (0, import_common.quoteWebhookTable)(outboxOptions.tableName ?? "adcp_webhook_outbox");
   const claimScope = {
     publisherScope: options.publisherScope,
-    tenantScope: stableRegistryScope(options.registry.registryId, binding.namespace)
+    tenantScope: stableRegistryScope(registryId, binding.namespace)
   };
   const backend = (0, import_pg.pgWebhookDeliveryRecoveryBackend)(binding.pool, { ...outboxOptions, claimScope });
   const recovery = (0, import_recovery.createWebhookDeliveryRecovery)({
@@ -74,22 +78,35 @@ function createPostgresTaskSettlementCoordinator(options) {
     durability: "durable",
     recovery,
     async settle(ref, terminal, push) {
-      if (ref.registryId !== options.registry.registryId) {
+      const settlementRef = snapshotSettlementRef(ref);
+      if (settlementRef.registryId !== registryId) {
         return { outcome: "not_found_in_scope", delivery: "not_applicable" };
       }
+      let clonedTerminal;
+      let clonedPush;
+      try {
+        clonedTerminal = structuredClone(terminal);
+        clonedPush = structuredClone(push);
+        (0, import_well_formed_unicode.assertWellFormedUnicode)(clonedTerminal, "Task terminal result/error");
+        (0, import_well_formed_unicode.assertWellFormedUnicode)(clonedPush, "Task push settlement config");
+      } catch (cause) {
+        throw new TaskPushSettlementConfigurationError("Task settlement inputs must contain serializable JSON", {
+          cause
+        });
+      }
       const deliveryKey = {
         ...claimScope,
-        deliveryId: stableScope("task-webhook", ref)
+        deliveryId: stableScope("task-webhook", settlementRef)
       };
       const transactionalPool = pool;
       let observed;
       try {
-        observed = await readTaskRow(transactionalPool, binding.tableName, binding.namespace, ref, false);
+        observed = await readTaskRow(transactionalPool, binding.tableName, binding.namespace, settlementRef, false);
       } catch (cause) {
         throwSettlementFailure(cause);
       }
       if (!observed) return { outcome: "not_found_in_scope", delivery: "not_applicable" };
-      validatePush(push);
+      validatePush(clonedPush);
       if (observed.has_webhook !== true) {
         throw new TaskPushSettlementConfigurationError(
           "Crash-safe push settlement requires a task created with hasWebhook: true"
@@ -98,8 +115,9 @@ function createPostgresTaskSettlementCoordinator(options) {
       let result;
       let error;
       try {
-        result = terminal.status === "completed" ? (0, import_task_registry.sanitizeTaskResultForWire)(structuredClone(terminal.result), ref) : terminal.result === void 0 ? { errors: [(0, import_errors.sanitizeStructuredAdcpError)(terminal.error)] } : (0, import_task_registry.sanitizeTaskResultForWire)(structuredClone(terminal.result), ref);
-        error = terminal.status === "failed" ? (0, import_errors.sanitizeStructuredAdcpError)(terminal.error) : void 0;
+        result = clonedTerminal.status === "completed" ? (0, import_task_registry.sanitizeTaskResultForWire)(clonedTerminal.result, settlementRef) : clonedTerminal.result === void 0 ? { errors: [(0, import_errors.sanitizeStructuredAdcpError)(clonedTerminal.error)] } : (0, import_task_registry.sanitizeTaskResultForWire)(clonedTerminal.result, settlementRef);
+        error = clonedTerminal.status === "failed" ? (0, import_errors.sanitizeStructuredAdcpError)(clonedTerminal.error) : void 0;
+        (0, import_well_formed_unicode.assertWellFormedUnicode)({ result, error }, "Task terminal result/error");
         (0, import_jcs.canonicalJsonSha256)({ result, error });
         assertPayloadSize(result, error);
       } catch (cause) {
@@ -108,7 +126,7 @@ function createPostgresTaskSettlementCoordinator(options) {
           cause
         });
       }
-      if (TERMINAL.has(observed.status) && !terminalMatches(observed, terminal.status, result, error)) {
+      if (TERMINAL.has(observed.status) && !terminalMatches(observed, clonedTerminal.status, result, error, settlementRef)) {
         return {
           outcome: "already_terminal",
           status: observed.status,
@@ -135,27 +153,27 @@ function createPostgresTaskSettlementCoordinator(options) {
       const existingTimestamp = observedOutbox?.state === "pending" ? observedOutbox.snapshot.payload.timestamp : void 0;
       const payload = {
         idempotency_key: `pending.${deliveryKey.deliveryId.slice(-48)}`,
-        operation_id: resolveOperationId(push, observed.tool, ref.taskId),
-        task_id: ref.taskId,
+        operation_id: resolveOperationId(clonedPush, observed.tool, settlementRef.taskId),
+        task_id: settlementRef.taskId,
         task_type: observed.tool,
-        status: terminal.status,
+        status: clonedTerminal.status,
         timestamp: typeof existingTimestamp === "string" ? existingTimestamp : (/* @__PURE__ */ new Date()).toISOString(),
         protocol: (0, import_protocol_for_tool.protocolForTool)(observed.tool),
         result,
-        ...push.token !== void 0 && { token: push.token },
-        ...terminal.status === "failed" && { message: error.message }
+        ...clonedPush.token !== void 0 && { token: clonedPush.token },
+        ...clonedTerminal.status === "failed" && { message: error.message }
       };
       let prepared;
       try {
         prepared = await recovery.prepare(
           deliveryKey,
           {
-            url: push.url,
+            url: clonedPush.url,
             payload,
-            authentication: push.authentication ?? null,
+            authentication: clonedPush.authentication ?? null,
             retries
           },
-          { protectPayloadToken: push.token !== void 0 }
+          { protectPayloadToken: clonedPush.token !== void 0 }
         );
       } catch (cause) {
         if (cause instanceof import_recovery.WebhookAuthenticationProtectionError) throwSettlementFailure(cause);
@@ -163,12 +181,12 @@ function createPostgresTaskSettlementCoordinator(options) {
           cause
         });
       }
-      const intentFingerprint = taskPushIntentFingerprint(prepared.snapshot);
+      const intentFingerprint = taskPushIntentFingerprint(prepared.snapshot, settlementRef);
       let client;
       try {
         client = await transactionalPool.connect();
         await client.query("BEGIN");
-        const row = await readTaskRow(client, binding.tableName, binding.namespace, ref, true);
+        const row = await readTaskRow(client, binding.tableName, binding.namespace, settlementRef, true);
         if (!row) {
           await client.query("ROLLBACK");
           return { outcome: "not_found_in_scope", delivery: "not_applicable" };
@@ -186,7 +204,7 @@ function createPostgresTaskSettlementCoordinator(options) {
             `Task type ${row.tool} cannot be emitted by the closed AdCP task-webhook schema`
           );
         }
-        const compatible = terminalMatches(row, terminal.status, result, error);
+        const compatible = terminalMatches(row, clonedTerminal.status, result, error, settlementRef);
         if (TERMINAL.has(row.status) && !compatible) {
           await client.query("COMMIT");
           return {
@@ -208,7 +226,9 @@ function createPostgresTaskSettlementCoordinator(options) {
           if (!TERMINAL.has(row.status)) {
             throw new Error("Settled webhook outbox row exists for a non-terminal task");
           }
-          if (existing.intent_fingerprint && existing.intent_fingerprint !== intentFingerprint) {
+          const matchesCurrentIntent = existing.intent_fingerprint === intentFingerprint;
+          const matchesLegacyArtifact = existing.intent_fingerprint !== null && existing.intent_fingerprint === taskPushLegacyIntentFingerprint(prepared.snapshot, row.result);
+          if (existing.intent_fingerprint !== null && !matchesCurrentIntent && !matchesLegacyArtifact) {
             throw new TaskPushSettlementConfigurationError(
               "Terminal webhook delivery identity is already bound to a conflicting route or payload"
             );
@@ -221,7 +241,7 @@ function createPostgresTaskSettlementCoordinator(options) {
             delivery: deliveryState(existing)
           };
         }
-        if (existing && !outboxMatchesPrepared(existing, prepared, intentFingerprint)) {
+        if (existing && !outboxMatchesPrepared(existing, intentFingerprint, settlementRef)) {
           throw new TaskPushSettlementConfigurationError(
             "Terminal webhook delivery identity is already bound to a conflicting route or payload"
           );
@@ -245,7 +265,7 @@ function createPostgresTaskSettlementCoordinator(options) {
           );
           if ((write.rowCount ?? 0) !== 1) {
             const raced = await readOutbox(client, outboxTable, deliveryKey, true);
-            if (!raced || !outboxMatchesPrepared(raced, prepared, intentFingerprint)) {
+            if (!raced || !outboxMatchesPrepared(raced, intentFingerprint, settlementRef)) {
               throw new TaskPushSettlementConfigurationError(
                 "Terminal webhook delivery identity is already bound to a conflicting route or payload"
               );
@@ -257,22 +277,28 @@ function createPostgresTaskSettlementCoordinator(options) {
           }
         }
         if (!TERMINAL.has(row.status)) {
-          const update = terminal.status === "completed" ? await client.query(
+          const update = clonedTerminal.status === "completed" ? await client.query(
             `UPDATE ${binding.tableName}
                       SET status = 'completed', result = $5::jsonb, error = NULL,
                           status_message = NULL, updated_at = clock_timestamp()
                     WHERE task_id = $1 AND registry_namespace = $2 AND account_id = $3 AND owner_scope = $4`,
-            [ref.taskId, binding.namespace, ref.accountId, ref.ownerScope, JSON.stringify(result)]
+            [
+              settlementRef.taskId,
+              binding.namespace,
+              settlementRef.accountId,
+              settlementRef.ownerScope,
+              JSON.stringify(result)
+            ]
           ) : await client.query(
             `UPDATE ${binding.tableName}
                       SET status = 'failed', result = $5::jsonb, error = $6::jsonb,
                           status_message = $7, updated_at = clock_timestamp()
                     WHERE task_id = $1 AND registry_namespace = $2 AND account_id = $3 AND owner_scope = $4`,
             [
-              ref.taskId,
+              settlementRef.taskId,
               binding.namespace,
-              ref.accountId,
-              ref.ownerScope,
+              settlementRef.accountId,
+              settlementRef.ownerScope,
               JSON.stringify(result),
               JSON.stringify(error),
               error.message
@@ -304,9 +330,33 @@ async function completeScopedPushTask(coordinator, ref, push, result) {
 async function failScopedPushTask(coordinator, ref, push, error, result) {
   return coordinator.settle(ref, { status: "failed", error, ...result !== void 0 && { result } }, push);
 }
-function terminalMatches(row, status, result, error) {
+function snapshotSettlementRef(ref) {
+  const cloned = structuredClone(ref);
+  const snapshot = {
+    registryId: requireSettlementRefPart(cloned.registryId, "registryId"),
+    accountId: requireSettlementRefPart(cloned.accountId, "accountId"),
+    ownerScope: requireSettlementRefPart(cloned.ownerScope, "ownerScope"),
+    taskId: requireSettlementRefPart(cloned.taskId, "taskId")
+  };
+  (0, import_well_formed_unicode.assertWellFormedUnicode)(snapshot, "Task settlement reference");
+  return snapshot;
+}
+function requireSettlementRefPart(value, field) {
+  if (typeof value !== "string" || value.length === 0) {
+    throw new TypeError(`Task settlement ${field} must be a non-empty string`);
+  }
+  return value;
+}
+function terminalMatches(row, status, result, error, ref) {
   if (row.status !== status) return false;
-  return (0, import_jcs.canonicalJsonSha256)(row.result) === (0, import_jcs.canonicalJsonSha256)(result) && (status === "completed" || (0, import_jcs.canonicalJsonSha256)(row.error) === (0, import_jcs.canonicalJsonSha256)(error));
+  try {
+    (0, import_well_formed_unicode.assertWellFormedUnicode)({ result: row.result, error: row.error }, "Stored task terminal result/error");
+    const storedResult = (0, import_task_registry.sanitizeTaskResultForWire)(structuredClone(row.result), ref);
+    const storedError = status === "failed" ? (0, import_errors.sanitizeStructuredAdcpError)(structuredClone(row.error)) : void 0;
+    return (0, import_jcs.canonicalJsonSha256)(storedResult) === (0, import_jcs.canonicalJsonSha256)(result) && (status === "completed" || (0, import_jcs.canonicalJsonSha256)(storedError) === (0, import_jcs.canonicalJsonSha256)(error));
+  } catch {
+    return false;
+  }
 }
 function stableScope(prefix, ref) {
   const digest = (0, import_node_crypto.createHash)("sha256").update(JSON.stringify([ref.registryId, ref.accountId, ref.ownerScope, ref.taskId])).digest("hex");
@@ -316,20 +366,36 @@ function stableRegistryScope(registryId, namespace) {
   const digest = (0, import_node_crypto.createHash)("sha256").update(JSON.stringify([registryId, namespace])).digest("hex");
   return `task-registry:${digest}`;
 }
-function taskPushIntentFingerprint(snapshot) {
-  const { timestamp: _generatedTimestamp, ...payload } = snapshot.payload;
-  return (0, import_jcs.canonicalJsonSha256)({
+function taskPushIntentFingerprint(snapshot, ref) {
+  const { timestamp: _generatedTimestamp, ...storedPayload } = snapshot.payload;
+  const payload = structuredClone(storedPayload);
+  if (Object.hasOwn(payload, "result")) {
+    payload.result = (0, import_task_registry.sanitizeTaskResultForWire)(payload.result, ref);
+  }
+  return taskPushIntentFingerprintForPayload(snapshot, payload);
+}
+function taskPushLegacyIntentFingerprint(snapshot, storedResult) {
+  const { timestamp: _generatedTimestamp, ...storedPayload } = snapshot.payload;
+  const payload = structuredClone(storedPayload);
+  payload.result = structuredClone(storedResult);
+  return taskPushIntentFingerprintForPayload(snapshot, payload);
+}
+function taskPushIntentFingerprintForPayload(snapshot, payload) {
+  const domain = {
     url: snapshot.url,
     payload,
     retries: snapshot.retries,
     authentication: snapshot.authentication.kind === "none" ? { kind: "none" } : { kind: "protected", fingerprint: snapshot.authentication.fingerprint },
     ...snapshot.payloadToken && { payloadToken: { fingerprint: snapshot.payloadToken.fingerprint } }
-  });
+  };
+  (0, import_well_formed_unicode.assertWellFormedUnicode)(domain, "Task push settlement fingerprint");
+  return (0, import_jcs.canonicalJsonSha256)(domain);
 }
 function validatePush(push) {
   if (!push || typeof push !== "object") {
     throw new TaskPushSettlementConfigurationError("push settlement config is required");
   }
+  (0, import_well_formed_unicode.assertWellFormedUnicode)(push, "Task push settlement config");
   const allowHttp = process.env.NODE_ENV === "test" || process.env.NODE_ENV === "development" || process.env.ADCP_DECISIONING_ALLOW_HTTP_WEBHOOKS === "1";
   let parsedUrl;
   try {
@@ -412,8 +478,14 @@ async function readOutbox(db, table, key, lock) {
   );
   return found.rows[0];
 }
-function outboxMatchesPrepared(existing, prepared, intentFingerprint) {
-  return existing.intent_fingerprint !== null ? existing.intent_fingerprint === intentFingerprint : existing.snapshot_fingerprint === prepared.snapshotFingerprint;
+function outboxMatchesPrepared(existing, intentFingerprint, ref) {
+  if (existing.intent_fingerprint === intentFingerprint) return true;
+  if (existing.state === "settled") return false;
+  try {
+    return taskPushIntentFingerprint(existing.snapshot, ref) === intentFingerprint;
+  } catch {
+    return false;
+  }
 }
 function throwSettlementFailure(cause) {
   if (cause instanceof TaskPushSettlementConfigurationError) throw cause;

package/dist/lib/server/decisioning/runtime/postgres-task-settlement.mjs

@@ -1,6 +1,7 @@
 import { createHash } from "node:crypto";
 import { canonicalJsonSha256 } from "../../../utils/jcs.mjs";
 import { isAdcpVersionAtLeast, isValidAdcpVersion } from "../../../utils/adcp-version-config.mjs";
+import { assertWellFormedUnicode } from "../../../utils/well-formed-unicode.mjs";
 import { sanitizeStructuredAdcpError } from "../../errors.mjs";
 import { quoteWebhookTable } from "../../webhook-delivery/common.mjs";
 import {
@@ -30,17 +31,20 @@ function createPostgresTaskSettlementCoordinator(options) {
       "Crash-safe task settlement requires a pg Pool with connect(); a query-only adapter cannot own a transaction"
     );
   }
-  if (typeof options.registry.registryId !== "string" || options.registry.registryId.length === 0) {
+  const registryId = options.registry.registryId;
+  if (typeof registryId !== "string" || registryId.length === 0) {
     throw new TypeError("Crash-safe task settlement requires task registry storageId/registryId binding");
   }
   if (typeof options.publisherScope !== "string" || options.publisherScope.length === 0) {
     throw new TypeError("publisherScope must be a non-empty string");
   }
+  assertWellFormedUnicode(registryId, "Task settlement registryId");
+  assertWellFormedUnicode(options.publisherScope, "Task settlement publisherScope");
   const outboxOptions = options.outbox ?? {};
   const outboxTable = quoteWebhookTable(outboxOptions.tableName ?? "adcp_webhook_outbox");
   const claimScope = {
     publisherScope: options.publisherScope,
-    tenantScope: stableRegistryScope(options.registry.registryId, binding.namespace)
+    tenantScope: stableRegistryScope(registryId, binding.namespace)
   };
   const backend = pgWebhookDeliveryRecoveryBackend(binding.pool, { ...outboxOptions, claimScope });
   const recovery = createWebhookDeliveryRecovery({
@@ -53,22 +57,35 @@ function createPostgresTaskSettlementCoordinator(options) {
     durability: "durable",
     recovery,
     async settle(ref, terminal, push) {
-      if (ref.registryId !== options.registry.registryId) {
+      const settlementRef = snapshotSettlementRef(ref);
+      if (settlementRef.registryId !== registryId) {
         return { outcome: "not_found_in_scope", delivery: "not_applicable" };
       }
+      let clonedTerminal;
+      let clonedPush;
+      try {
+        clonedTerminal = structuredClone(terminal);
+        clonedPush = structuredClone(push);
+        assertWellFormedUnicode(clonedTerminal, "Task terminal result/error");
+        assertWellFormedUnicode(clonedPush, "Task push settlement config");
+      } catch (cause) {
+        throw new TaskPushSettlementConfigurationError("Task settlement inputs must contain serializable JSON", {
+          cause
+        });
+      }
       const deliveryKey = {
         ...claimScope,
-        deliveryId: stableScope("task-webhook", ref)
+        deliveryId: stableScope("task-webhook", settlementRef)
       };
       const transactionalPool = pool;
       let observed;
       try {
-        observed = await readTaskRow(transactionalPool, binding.tableName, binding.namespace, ref, false);
+        observed = await readTaskRow(transactionalPool, binding.tableName, binding.namespace, settlementRef, false);
       } catch (cause) {
         throwSettlementFailure(cause);
       }
       if (!observed) return { outcome: "not_found_in_scope", delivery: "not_applicable" };
-      validatePush(push);
+      validatePush(clonedPush);
       if (observed.has_webhook !== true) {
         throw new TaskPushSettlementConfigurationError(
           "Crash-safe push settlement requires a task created with hasWebhook: true"
@@ -77,8 +94,9 @@ function createPostgresTaskSettlementCoordinator(options) {
       let result;
       let error;
       try {
-        result = terminal.status === "completed" ? sanitizeTaskResultForWire(structuredClone(terminal.result), ref) : terminal.result === void 0 ? { errors: [sanitizeStructuredAdcpError(terminal.error)] } : sanitizeTaskResultForWire(structuredClone(terminal.result), ref);
-        error = terminal.status === "failed" ? sanitizeStructuredAdcpError(terminal.error) : void 0;
+        result = clonedTerminal.status === "completed" ? sanitizeTaskResultForWire(clonedTerminal.result, settlementRef) : clonedTerminal.result === void 0 ? { errors: [sanitizeStructuredAdcpError(clonedTerminal.error)] } : sanitizeTaskResultForWire(clonedTerminal.result, settlementRef);
+        error = clonedTerminal.status === "failed" ? sanitizeStructuredAdcpError(clonedTerminal.error) : void 0;
+        assertWellFormedUnicode({ result, error }, "Task terminal result/error");
         canonicalJsonSha256({ result, error });
         assertPayloadSize(result, error);
       } catch (cause) {
@@ -87,7 +105,7 @@ function createPostgresTaskSettlementCoordinator(options) {
           cause
         });
       }
-      if (TERMINAL.has(observed.status) && !terminalMatches(observed, terminal.status, result, error)) {
+      if (TERMINAL.has(observed.status) && !terminalMatches(observed, clonedTerminal.status, result, error, settlementRef)) {
         return {
           outcome: "already_terminal",
           status: observed.status,
@@ -114,27 +132,27 @@ function createPostgresTaskSettlementCoordinator(options) {
       const existingTimestamp = observedOutbox?.state === "pending" ? observedOutbox.snapshot.payload.timestamp : void 0;
       const payload = {
         idempotency_key: `pending.${deliveryKey.deliveryId.slice(-48)}`,
-        operation_id: resolveOperationId(push, observed.tool, ref.taskId),
-        task_id: ref.taskId,
+        operation_id: resolveOperationId(clonedPush, observed.tool, settlementRef.taskId),
+        task_id: settlementRef.taskId,
         task_type: observed.tool,
-        status: terminal.status,
+        status: clonedTerminal.status,
         timestamp: typeof existingTimestamp === "string" ? existingTimestamp : (/* @__PURE__ */ new Date()).toISOString(),
         protocol: protocolForTool(observed.tool),
         result,
-        ...push.token !== void 0 && { token: push.token },
-        ...terminal.status === "failed" && { message: error.message }
+        ...clonedPush.token !== void 0 && { token: clonedPush.token },
+        ...clonedTerminal.status === "failed" && { message: error.message }
       };
       let prepared;
       try {
         prepared = await recovery.prepare(
           deliveryKey,
           {
-            url: push.url,
+            url: clonedPush.url,
             payload,
-            authentication: push.authentication ?? null,
+            authentication: clonedPush.authentication ?? null,
             retries
           },
-          { protectPayloadToken: push.token !== void 0 }
+          { protectPayloadToken: clonedPush.token !== void 0 }
         );
       } catch (cause) {
         if (cause instanceof WebhookAuthenticationProtectionError) throwSettlementFailure(cause);
@@ -142,12 +160,12 @@ function createPostgresTaskSettlementCoordinator(options) {
           cause
         });
       }
-      const intentFingerprint = taskPushIntentFingerprint(prepared.snapshot);
+      const intentFingerprint = taskPushIntentFingerprint(prepared.snapshot, settlementRef);
       let client;
       try {
         client = await transactionalPool.connect();
         await client.query("BEGIN");
-        const row = await readTaskRow(client, binding.tableName, binding.namespace, ref, true);
+        const row = await readTaskRow(client, binding.tableName, binding.namespace, settlementRef, true);
         if (!row) {
           await client.query("ROLLBACK");
           return { outcome: "not_found_in_scope", delivery: "not_applicable" };
@@ -165,7 +183,7 @@ function createPostgresTaskSettlementCoordinator(options) {
             `Task type ${row.tool} cannot be emitted by the closed AdCP task-webhook schema`
           );
         }
-        const compatible = terminalMatches(row, terminal.status, result, error);
+        const compatible = terminalMatches(row, clonedTerminal.status, result, error, settlementRef);
         if (TERMINAL.has(row.status) && !compatible) {
           await client.query("COMMIT");
           return {
@@ -187,7 +205,9 @@ function createPostgresTaskSettlementCoordinator(options) {
           if (!TERMINAL.has(row.status)) {
             throw new Error("Settled webhook outbox row exists for a non-terminal task");
           }
-          if (existing.intent_fingerprint && existing.intent_fingerprint !== intentFingerprint) {
+          const matchesCurrentIntent = existing.intent_fingerprint === intentFingerprint;
+          const matchesLegacyArtifact = existing.intent_fingerprint !== null && existing.intent_fingerprint === taskPushLegacyIntentFingerprint(prepared.snapshot, row.result);
+          if (existing.intent_fingerprint !== null && !matchesCurrentIntent && !matchesLegacyArtifact) {
             throw new TaskPushSettlementConfigurationError(
               "Terminal webhook delivery identity is already bound to a conflicting route or payload"
             );
@@ -200,7 +220,7 @@ function createPostgresTaskSettlementCoordinator(options) {
             delivery: deliveryState(existing)
           };
         }
-        if (existing && !outboxMatchesPrepared(existing, prepared, intentFingerprint)) {
+        if (existing && !outboxMatchesPrepared(existing, intentFingerprint, settlementRef)) {
           throw new TaskPushSettlementConfigurationError(
             "Terminal webhook delivery identity is already bound to a conflicting route or payload"
           );
@@ -224,7 +244,7 @@ function createPostgresTaskSettlementCoordinator(options) {
           );
           if ((write.rowCount ?? 0) !== 1) {
             const raced = await readOutbox(client, outboxTable, deliveryKey, true);
-            if (!raced || !outboxMatchesPrepared(raced, prepared, intentFingerprint)) {
+            if (!raced || !outboxMatchesPrepared(raced, intentFingerprint, settlementRef)) {
               throw new TaskPushSettlementConfigurationError(
                 "Terminal webhook delivery identity is already bound to a conflicting route or payload"
               );
@@ -236,22 +256,28 @@ function createPostgresTaskSettlementCoordinator(options) {
           }
         }
         if (!TERMINAL.has(row.status)) {
-          const update = terminal.status === "completed" ? await client.query(
+          const update = clonedTerminal.status === "completed" ? await client.query(
             `UPDATE ${binding.tableName}
                       SET status = 'completed', result = $5::jsonb, error = NULL,
                           status_message = NULL, updated_at = clock_timestamp()
                     WHERE task_id = $1 AND registry_namespace = $2 AND account_id = $3 AND owner_scope = $4`,
-            [ref.taskId, binding.namespace, ref.accountId, ref.ownerScope, JSON.stringify(result)]
+            [
+              settlementRef.taskId,
+              binding.namespace,
+              settlementRef.accountId,
+              settlementRef.ownerScope,
+              JSON.stringify(result)
+            ]
           ) : await client.query(
             `UPDATE ${binding.tableName}
                       SET status = 'failed', result = $5::jsonb, error = $6::jsonb,
                           status_message = $7, updated_at = clock_timestamp()
                     WHERE task_id = $1 AND registry_namespace = $2 AND account_id = $3 AND owner_scope = $4`,
             [
-              ref.taskId,
+              settlementRef.taskId,
               binding.namespace,
-              ref.accountId,
-              ref.ownerScope,
+              settlementRef.accountId,
+              settlementRef.ownerScope,
               JSON.stringify(result),
               JSON.stringify(error),
               error.message
@@ -283,9 +309,33 @@ async function completeScopedPushTask(coordinator, ref, push, result) {
 async function failScopedPushTask(coordinator, ref, push, error, result) {
   return coordinator.settle(ref, { status: "failed", error, ...result !== void 0 && { result } }, push);
 }
-function terminalMatches(row, status, result, error) {
+function snapshotSettlementRef(ref) {
+  const cloned = structuredClone(ref);
+  const snapshot = {
+    registryId: requireSettlementRefPart(cloned.registryId, "registryId"),
+    accountId: requireSettlementRefPart(cloned.accountId, "accountId"),
+    ownerScope: requireSettlementRefPart(cloned.ownerScope, "ownerScope"),
+    taskId: requireSettlementRefPart(cloned.taskId, "taskId")
+  };
+  assertWellFormedUnicode(snapshot, "Task settlement reference");
+  return snapshot;
+}
+function requireSettlementRefPart(value, field) {
+  if (typeof value !== "string" || value.length === 0) {
+    throw new TypeError(`Task settlement ${field} must be a non-empty string`);
+  }
+  return value;
+}
+function terminalMatches(row, status, result, error, ref) {
   if (row.status !== status) return false;
-  return canonicalJsonSha256(row.result) === canonicalJsonSha256(result) && (status === "completed" || canonicalJsonSha256(row.error) === canonicalJsonSha256(error));
+  try {
+    assertWellFormedUnicode({ result: row.result, error: row.error }, "Stored task terminal result/error");
+    const storedResult = sanitizeTaskResultForWire(structuredClone(row.result), ref);
+    const storedError = status === "failed" ? sanitizeStructuredAdcpError(structuredClone(row.error)) : void 0;
+    return canonicalJsonSha256(storedResult) === canonicalJsonSha256(result) && (status === "completed" || canonicalJsonSha256(storedError) === canonicalJsonSha256(error));
+  } catch {
+    return false;
+  }
 }
 function stableScope(prefix, ref) {
   const digest = createHash("sha256").update(JSON.stringify([ref.registryId, ref.accountId, ref.ownerScope, ref.taskId])).digest("hex");
@@ -295,20 +345,36 @@ function stableRegistryScope(registryId, namespace) {
   const digest = createHash("sha256").update(JSON.stringify([registryId, namespace])).digest("hex");
   return `task-registry:${digest}`;
 }
-function taskPushIntentFingerprint(snapshot) {
-  const { timestamp: _generatedTimestamp, ...payload } = snapshot.payload;
-  return canonicalJsonSha256({
+function taskPushIntentFingerprint(snapshot, ref) {
+  const { timestamp: _generatedTimestamp, ...storedPayload } = snapshot.payload;
+  const payload = structuredClone(storedPayload);
+  if (Object.hasOwn(payload, "result")) {
+    payload.result = sanitizeTaskResultForWire(payload.result, ref);
+  }
+  return taskPushIntentFingerprintForPayload(snapshot, payload);
+}
+function taskPushLegacyIntentFingerprint(snapshot, storedResult) {
+  const { timestamp: _generatedTimestamp, ...storedPayload } = snapshot.payload;
+  const payload = structuredClone(storedPayload);
+  payload.result = structuredClone(storedResult);
+  return taskPushIntentFingerprintForPayload(snapshot, payload);
+}
+function taskPushIntentFingerprintForPayload(snapshot, payload) {
+  const domain = {
     url: snapshot.url,
     payload,
     retries: snapshot.retries,
     authentication: snapshot.authentication.kind === "none" ? { kind: "none" } : { kind: "protected", fingerprint: snapshot.authentication.fingerprint },
     ...snapshot.payloadToken && { payloadToken: { fingerprint: snapshot.payloadToken.fingerprint } }
-  });
+  };
+  assertWellFormedUnicode(domain, "Task push settlement fingerprint");
+  return canonicalJsonSha256(domain);
 }
 function validatePush(push) {
   if (!push || typeof push !== "object") {
     throw new TaskPushSettlementConfigurationError("push settlement config is required");
   }
+  assertWellFormedUnicode(push, "Task push settlement config");
   const allowHttp = process.env.NODE_ENV === "test" || process.env.NODE_ENV === "development" || process.env.ADCP_DECISIONING_ALLOW_HTTP_WEBHOOKS === "1";
   let parsedUrl;
   try {
@@ -391,8 +457,14 @@ async function readOutbox(db, table, key, lock) {
   );
   return found.rows[0];
 }
-function outboxMatchesPrepared(existing, prepared, intentFingerprint) {
-  return existing.intent_fingerprint !== null ? existing.intent_fingerprint === intentFingerprint : existing.snapshot_fingerprint === prepared.snapshotFingerprint;
+function outboxMatchesPrepared(existing, intentFingerprint, ref) {
+  if (existing.intent_fingerprint === intentFingerprint) return true;
+  if (existing.state === "settled") return false;
+  try {
+    return taskPushIntentFingerprint(existing.snapshot, ref) === intentFingerprint;
+  } catch {
+    return false;
+  }
 }
 function throwSettlementFailure(cause) {
   if (cause instanceof TaskPushSettlementConfigurationError) throw cause;