@towns-labs/relayer 2.1.0 → 3.0.0

package/dist/README.md

@@ -1 +1 @@
-This folder contains the built output assets for the worker "relayer-worker" generated at 2026-02-13T08:35:58.863Z.
+This folder contains the built output assets for the worker "relayer-worker" generated at 2026-02-18T05:42:51.313Z.

package/dist/index.js

@@ -12238,6 +12238,18 @@ var addresses_default = {
         simulator: "0xDAD7c34d0c41698B227D3C5ee3d6d88A78c63a65",
         townsAccount: "0x2eEBFfcFABEB8cE3AC016effFeC37dBBAccCff2a"
       }
+    },
+    "42161": {
+      addresses: {
+        accountProxy: "0x9172852305F32819469bf38A3772f29361d7b768",
+        escrow: "0x05f9597eed844410b7c0746A1C584188d0644730",
+        multiSigSigner: "0xa3972FEebd6E1f973eD19cC586D79B3F61f892A3",
+        orchestrator: "0x11050FEC41B66730E91c46Bfd25EBFF3B16F5bcC",
+        simpleFunder: "0x41D23D227C6D0F732D41eE5c203C48d96292A48B",
+        simpleSettler: "0x5386d1026e1598177e03eA52cbF1a0994ADF5eaE",
+        simulator: "0xDAD7c34d0c41698B227D3C5ee3d6d88A78c63a65",
+        townsAccount: "0x4f58d66c5d55B4E6f0aA578Df8D9342f63473FF6"
+      }
     }
   },
   stage: {
@@ -12264,6 +12276,18 @@ var addresses_default = {
         simulator: "0xDAD7c34d0c41698B227D3C5ee3d6d88A78c63a65",
         townsAccount: "0x4f58d66c5d55B4E6f0aA578Df8D9342f63473FF6"
       }
+    },
+    "42161": {
+      addresses: {
+        accountProxy: "0xeE06c19146427bDd5abb702579F3B0568b24Bf6F",
+        escrow: "0x05f9597eed844410b7c0746A1C584188d0644730",
+        multiSigSigner: "0xa3972FEebd6E1f973eD19cC586D79B3F61f892A3",
+        orchestrator: "0x11050FEC41B66730E91c46Bfd25EBFF3B16F5bcC",
+        simpleFunder: "0xf297614c45E3AfAAC849B7Cde4A20A8cF336D8bF",
+        simpleSettler: "0x195424235453eC103082A9406AEE0Cc30E908b24",
+        simulator: "0xDAD7c34d0c41698B227D3C5ee3d6d88A78c63a65",
+        townsAccount: "0x4f58d66c5d55B4E6f0aA578Df8D9342f63473FF6"
+      }
     }
   }
 };
@@ -23663,6 +23687,7 @@ var ACCOUNT_NOT_DELEGATED = -32009;
 var QUOTE_EXPIRED = -32010;
 var INVALID_QUOTE_SIGNATURE = -32011;
 var PAYMENT_EXCEEDS_MAX = -32012;
+var DRAFT_CONFLICT = -32013;
 var ERROR_MESSAGES = {
   [PARSE_ERROR]: "Parse error",
   [INVALID_REQUEST]: "Invalid Request",
@@ -23681,7 +23706,8 @@ var ERROR_MESSAGES = {
   [ACCOUNT_NOT_DELEGATED]: "Account not delegated",
   [QUOTE_EXPIRED]: "Quote expired",
   [INVALID_QUOTE_SIGNATURE]: "Invalid quote signature",
-  [PAYMENT_EXCEEDS_MAX]: "Payment amount exceeds maximum"
+  [PAYMENT_EXCEEDS_MAX]: "Payment amount exceeds maximum",
+  [DRAFT_CONFLICT]: "Draft conflict"
 };
 var RpcError2 = class extends Error {
   static {
@@ -23827,58 +23853,35 @@ var INTENT_TYPES = {
 // src/services/relayer.ts
 function createIntentNonceProvider(durableObject, chainId) {
   const durableObjectNameFor = /* @__PURE__ */ __name((eoa) => `${chainId}:${eoa.toLowerCase()}`, "durableObjectNameFor");
+  const getStubForEoa = /* @__PURE__ */ __name((eoa) => {
+    const id = durableObject.idFromName(durableObjectNameFor(eoa));
+    return durableObject.get(id);
+  }, "getStubForEoa");
+  const postToNonceDo = /* @__PURE__ */ __name(async (eoa, path, body) => {
+    const stub = getStubForEoa(eoa);
+    return stub.fetch(
+      new Request(`http://do/${path}`, {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify(body)
+      })
+    );
+  }, "postToNonceDo");
   return {
-    async acquireNonce(eoa, seqKey = 0n) {
-      const id = durableObject.idFromName(durableObjectNameFor(eoa));
-      const stub = durableObject.get(id);
-      const response = await stub.fetch(
-        new Request("http://do/acquire", {
-          method: "POST",
-          headers: { "Content-Type": "application/json" },
-          body: JSON.stringify({ seqKey: seqKey.toString() })
-        })
-      );
-      if (!response.ok) {
-        const error48 = await response.json();
-        throw new Error(`Failed to acquire intent nonce: ${error48.error}`);
-      }
-      const data = await response.json();
-      return BigInt(data.nonce);
-    },
-    async acquireNonceSynced(eoa, seqKey, onChainSeq) {
-      const id = durableObject.idFromName(durableObjectNameFor(eoa));
-      const stub = durableObject.get(id);
-      const response = await stub.fetch(
-        new Request("http://do/acquire_synced", {
-          method: "POST",
-          headers: { "Content-Type": "application/json" },
-          body: JSON.stringify({
-            seqKey: seqKey.toString(),
-            onChainSeq: onChainSeq.toString()
-          })
-        })
-      );
-      if (!response.ok) {
-        const error48 = await response.json();
-        throw new Error(`Failed to acquire synced intent nonce: ${error48.error}`);
-      }
-      const data = await response.json();
-      return { nonce: BigInt(data.nonce), synced: data.synced };
-    },
     async acquireOrGetDraft(eoa, seqKey, onChainSeq, prepareKey) {
-      const id = durableObject.idFromName(durableObjectNameFor(eoa));
-      const stub = durableObject.get(id);
-      const response = await stub.fetch(
-        new Request("http://do/acquire_or_get_draft", {
-          method: "POST",
-          headers: { "Content-Type": "application/json" },
-          body: JSON.stringify({
-            seqKey: seqKey.toString(),
-            onChainSeq: onChainSeq.toString(),
-            draftKey: prepareKey
-          })
-        })
-      );
+      const response = await postToNonceDo(eoa, "acquire_or_get_draft", {
+        seqKey: seqKey.toString(),
+        onChainSeq: onChainSeq.toString(),
+        draftKey: prepareKey
+      });
+      if (response.status === 409) {
+        const body = await response.json();
+        return {
+          conflict: true,
+          error: body.error,
+          conflictDraftId: body.conflictDraftId
+        };
+      }
       if (!response.ok) {
         const error48 = await response.json();
         throw new Error(`Failed to acquire intent draft: ${error48.error}`);
@@ -23893,55 +23896,16 @@ function createIntentNonceProvider(durableObject, chainId) {
       };
     },
     async markSubmitted(eoa, seqKey, draftId) {
-      const id = durableObject.idFromName(durableObjectNameFor(eoa));
-      const stub = durableObject.get(id);
-      const response = await stub.fetch(
-        new Request("http://do/mark_submitted", {
-          method: "POST",
-          headers: { "Content-Type": "application/json" },
-          body: JSON.stringify({ seqKey: seqKey.toString(), draftId })
-        })
-      );
+      const response = await postToNonceDo(eoa, "mark_submitted", {
+        seqKey: seqKey.toString(),
+        draftId
+      });
       if (!response.ok) {
         const error48 = await response.json();
         throw new Error(`Failed to mark intent draft submitted: ${error48.error}`);
       }
       const data = await response.json();
       return data.status;
-    },
-    async cancelDraft(eoa, seqKey, draftId) {
-      const id = durableObject.idFromName(durableObjectNameFor(eoa));
-      const stub = durableObject.get(id);
-      const response = await stub.fetch(
-        new Request("http://do/cancel_draft", {
-          method: "POST",
-          headers: { "Content-Type": "application/json" },
-          body: JSON.stringify({ seqKey: seqKey.toString(), draftId })
-        })
-      );
-      if (!response.ok) {
-        const error48 = await response.json();
-        throw new Error(`Failed to cancel intent draft: ${error48.error}`);
-      }
-      const data = await response.json();
-      return data.status;
-    },
-    async syncNonce(eoa, seqKey, confirmedSeq) {
-      const id = durableObject.idFromName(durableObjectNameFor(eoa));
-      const stub = durableObject.get(id);
-      const response = await stub.fetch(
-        new Request("http://do/sync", {
-          method: "POST",
-          headers: { "Content-Type": "application/json" },
-          body: JSON.stringify({
-            seqKey: seqKey.toString(),
-            confirmedSeq: confirmedSeq.toString()
-          })
-        })
-      );
-      if (!response.ok) {
-        console.warn("Failed to sync intent nonce for:", eoa);
-      }
     }
   };
 }
@@ -23983,6 +23947,14 @@ function calculateCombinedGas(simulationGas, gasConfig, paymentEnabled) {
   return simulationGas + gasConfig.intentGasBuffer + (paymentEnabled ? gasConfig.paymentGasBuffer : 0n);
 }
 __name(calculateCombinedGas, "calculateCombinedGas");
+function normalizeCalls(calls) {
+  return calls.map((call2) => ({
+    to: call2.to,
+    value: call2.value ? BigInt(call2.value) : 0n,
+    data: call2.data ?? "0x"
+  }));
+}
+__name(normalizeCalls, "normalizeCalls");
 function extractRevertData(error48) {
   if (error48 instanceof BaseError2) {
     const rawError = error48.walk((e) => e instanceof RawContractError);
@@ -24069,12 +24041,20 @@ var RelayerService = class {
   async acquireNonceFromProvider(eoa, seqKey, prepareKey) {
     const onChainSeq = await this.fetchOnChainSeq(eoa, seqKey);
     const safeOnChainSeq = onChainSeq ?? 0n;
-    const { nonce, draftId, expiresAtMs, fromCache } = await this.intentNonceProvider.acquireOrGetDraft(
+    const result = await this.intentNonceProvider.acquireOrGetDraft(
       eoa,
       seqKey,
       safeOnChainSeq,
       prepareKey
     );
+    if ("conflict" in result) {
+      return {
+        success: false,
+        error: result.error,
+        conflictDraftId: result.conflictDraftId
+      };
+    }
+    const { nonce, draftId, expiresAtMs, fromCache } = result;
     if (onChainSeq === null) {
       this.logger.debug(
         { eoa, nonce: nonce.toString(), draftId },
@@ -24141,11 +24121,7 @@ var RelayerService = class {
           errorCode: "DELEGATION_PENDING"
         };
       }
-      const calls = request.calls.map((c2) => ({
-        to: c2.to,
-        value: c2.value ? BigInt(c2.value) : 0n,
-        data: c2.data ?? "0x"
-      }));
+      const calls = normalizeCalls(request.calls);
       const executionData = encodeAbiParameters(
         [
           {
@@ -24161,6 +24137,17 @@ var RelayerService = class {
       );
       const nowSeconds = BigInt(Math.floor(Date.now() / 1e3));
       const expiry = resolveIntentExpirySeconds(request.expiry, nowSeconds);
+      let signature = request.signature ?? "0x";
+      if (request.sessionKey && !request.signature) {
+        const keyHash = keccak256(
+          encodeAbiParameters(parseAbiParameters("uint8, bytes32"), [
+            0,
+            // secp256k1
+            keccak256(request.sessionKey)
+          ])
+        );
+        signature = concat([`0x${"00".repeat(65)}`, keyHash, "0x00"]);
+      }
       const intent = {
         eoa: request.eoa,
         executionData,
@@ -24180,7 +24167,7 @@ var RelayerService = class {
         settlerContext: request.settlerContext ?? "0x",
         paymentAmount: BigInt(request.paymentAmount ?? "0"),
         paymentRecipient: request.paymentRecipient ?? zeroAddress,
-        signature: request.signature ?? "0x",
+        signature,
         paymentSignature: request.paymentSignature ?? "0x",
         supportedAccountImplementation: request.supportedAccountImplementation ?? zeroAddress
       };
@@ -24294,7 +24281,11 @@ var RelayerService = class {
         request.prepareKey
       );
       if (!nonceResult.success) {
-        return { success: false, error: nonceResult.error };
+        return {
+          success: false,
+          error: nonceResult.error,
+          conflictDraftId: nonceResult.conflictDraftId
+        };
       }
       const nonce = nonceResult.nonce;
       const nowSeconds = BigInt(Math.floor(Date.now() / 1e3));
@@ -24306,11 +24297,7 @@ var RelayerService = class {
       const paymentToken = request.paymentToken ?? zeroAddress;
       const paymentMaxAmount = BigInt(request.paymentMaxAmount ?? "0");
       const paymentEnabled = isPaymentEnabled(payer, paymentToken);
-      const calls = request.calls.map((c2) => ({
-        to: c2.to,
-        value: c2.value ? BigInt(c2.value) : 0n,
-        data: c2.data ?? "0x"
-      }));
+      const calls = normalizeCalls(request.calls);
       const simulateResult = await this.simulateIntent({
         eoa: request.eoa,
         calls: request.calls,
@@ -24321,7 +24308,8 @@ var RelayerService = class {
         settler: request.settler,
         payer: request.payer,
         paymentToken: request.paymentToken,
-        paymentMaxAmount: request.paymentMaxAmount
+        paymentMaxAmount: request.paymentMaxAmount,
+        sessionKey: request.sessionKey
       });
       const simulationGas = simulateResult.gasUsed ? BigInt(simulateResult.gasUsed) : 0n;
       const simulationSucceeded = simulateResult.success && simulationGas > 0n;
@@ -24533,7 +24521,7 @@ function selectSignerForEoa(eoa, signerCount) {
 __name(selectSignerForEoa, "selectSignerForEoa");
 
 // src/rpc/methods/shared/calls-helpers.ts
-function getChainIdFromContext(context, _env) {
+function getChainIdFromContext(context) {
   if ("quote" in context && context.quote?.quotes?.length) {
     const first = parseHexChainId(context.quote.quotes[0].chainId, "chain_id");
     for (const quote of context.quote.quotes) {
@@ -24613,30 +24601,11 @@ function hashQuotes(signedQuotes, config2) {
 }
 __name(hashQuotes, "hashQuotes");
 function extractIntentFromContext(context) {
-  if ("quote" in context && context.quote) {
-    const quote = context.quote.quotes[0];
-    if (!quote) {
-      throw new RpcError2(INVALID_PARAMS, "No quote found in context");
-    }
-    return quote.intent;
+  const quote = context.quote.quotes[0];
+  if (!quote) {
+    throw new RpcError2(INVALID_PARAMS, "No quote found in context");
   }
-  const legacyContext = context;
-  return {
-    eoa: legacyContext.eoa,
-    calls: legacyContext.calls,
-    nonce: legacyContext.nonce,
-    combinedGas: legacyContext.combinedGas,
-    expiry: legacyContext.expiry,
-    encodedPreCalls: legacyContext.encodedPreCalls,
-    funder: legacyContext.funder,
-    encodedFundTransfers: legacyContext.encodedFundTransfers,
-    settler: legacyContext.settler,
-    settlerContext: legacyContext.settlerContext,
-    payer: legacyContext.payer,
-    paymentToken: legacyContext.paymentToken,
-    paymentMaxAmount: legacyContext.paymentMaxAmount,
-    paymentSignature: legacyContext.paymentSignature
-  };
+  return quote.intent;
 }
 __name(extractIntentFromContext, "extractIntentFromContext");
 async function validateQuote(signedQuotes, env) {
@@ -24671,12 +24640,7 @@ function buildIntentFromParams(params) {
   const { context, signature, paymentSignature: paramsPaymentSig, capabilities } = params;
   const explicitPaymentSignature = paramsPaymentSig ?? capabilities?.feeSignature;
   const quoteIntent = extractIntentFromContext(context);
-  let calculatedPaymentAmount = "0";
-  if ("quote" in context && context.quote?.quotes[0]) {
-    calculatedPaymentAmount = context.quote.quotes[0].paymentAmount ?? "0";
-  } else if ("paymentAmount" in context && context.paymentAmount) {
-    calculatedPaymentAmount = context.paymentAmount;
-  }
+  const calculatedPaymentAmount = context.quote.quotes[0]?.paymentAmount ?? "0";
   return {
     eoa: quoteIntent.eoa,
     calls: quoteIntent.calls.map((call2) => ({
@@ -24739,7 +24703,7 @@ async function handleSendPreparedCalls(params, ctx) {
     const quoteError = await validateQuote(context.quote, env);
     if (quoteError) throw quoteError;
   }
-  const chainId = getChainIdFromContext(context, env);
+  const chainId = getChainIdFromContext(context);
   const supportedChainIds = getChainIds(env);
   if (supportedChainIds.length > 0 && !supportedChainIds.includes(chainId)) {
     throw new RpcError2(INVALID_PARAMS, `Unsupported chain ID: ${chainId}`);
@@ -24912,7 +24876,7 @@ async function handleBatchSendPreparedCalls(requests, ctx) {
         continue;
       }
     }
-    const chainId = getChainIdFromContext(typedParams.context, env);
+    const chainId = getChainIdFromContext(typedParams.context);
     const supportedChainIds = getChainIds(env);
     if (supportedChainIds.length > 0 && !supportedChainIds.includes(chainId)) {
       validationErrors.set(
@@ -39874,9 +39838,32 @@ var ChainsConfigSchema = external_exports.object({
 var chains_default = {
   version: "1.0.0",
   chains: {
-    "31337": {
-      name: "local-anvil",
-      isTestnet: true,
+    "137": {
+      name: "polygon",
+      isTestnet: false,
+      nativeCurrency: {
+        name: "POL",
+        symbol: "POL",
+        decimals: 18
+      },
+      assets: {
+        pol: {
+          address: "0x0000000000000000000000000000000000000000",
+          decimals: 18,
+          feeToken: true,
+          interop: false
+        },
+        usdc: {
+          address: "0x3c499c542cEF5E3811e1192ce70d8cC03d5c3359",
+          decimals: 6,
+          feeToken: true,
+          interop: true
+        }
+      }
+    },
+    "8453": {
+      name: "base",
+      isTestnet: false,
       nativeCurrency: {
         name: "Ether",
         symbol: "ETH",
@@ -39893,12 +39880,12 @@ var chains_default = {
           address: "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913",
           decimals: 6,
           feeToken: true,
-          interop: false
+          interop: true
         }
       }
     },
-    "41337": {
-      name: "local-anvil-2",
+    "31337": {
+      name: "local-anvil",
       isTestnet: true,
       nativeCurrency: {
         name: "Ether",
@@ -39920,31 +39907,31 @@ var chains_default = {
         }
       }
     },
-    "137": {
-      name: "polygon",
-      isTestnet: false,
+    "41337": {
+      name: "local-anvil-2",
+      isTestnet: true,
       nativeCurrency: {
-        name: "POL",
-        symbol: "POL",
+        name: "Ether",
+        symbol: "ETH",
         decimals: 18
       },
       assets: {
-        pol: {
+        eth: {
           address: "0x0000000000000000000000000000000000000000",
           decimals: 18,
           feeToken: true,
           interop: false
         },
         usdc: {
-          address: "0x3c499c542cEF5E3811e1192ce70d8cC03d5c3359",
+          address: "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913",
           decimals: 6,
           feeToken: true,
-          interop: true
+          interop: false
         }
       }
     },
-    "8453": {
-      name: "base",
+    "42161": {
+      name: "arbitrum",
       isTestnet: false,
       nativeCurrency: {
         name: "Ether",
@@ -39959,10 +39946,10 @@ var chains_default = {
           interop: false
         },
         usdc: {
-          address: "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913",
+          address: "0xaf88d065e77c8cC2239327C5EDb3A432268e5831",
           decimals: 6,
           feeToken: true,
-          interop: true
+          interop: false
         }
       }
     },
@@ -40081,9 +40068,22 @@ async function handlePrepareCalls(params, ctx) {
     payer,
     paymentToken,
     paymentMaxAmount,
-    prepareKey
+    prepareKey,
+    sessionKey: typedParams.session_key
   });
   if (!result.success || !result.typedData || !result.digest) {
+    if (result.conflictDraftId) {
+      throw new RpcError2(DRAFT_CONFLICT, result.error ?? "Draft conflict", {
+        conflictDraftId: result.conflictDraftId
+      });
+    }
+    const rawError = result.error ?? "Failed to prepare calls";
+    if (rawError.toLowerCase().startsWith("simulation failed")) {
+      const cause = rawError.replace(/^simulation failed:\s*/i, "").trim();
+      throw new RpcError2(SIMULATION_FAILED, "Simulation failed", {
+        cause: cause.length > 0 ? cause : void 0
+      });
+    }
     throw new RpcError2(INTERNAL_ERROR, result.error ?? "Failed to prepare calls");
   }
   const feeConfig = getFeeConfig(env);
@@ -40218,14 +40218,6 @@ async function handlePrepareCalls(params, ctx) {
       message[key] = value;
     }
   }
-  let callKey;
-  if (typedParams.key) {
-    callKey = {
-      type: typedParams.key.type,
-      publicKey: typedParams.key.public_key,
-      prehash: typedParams.key.prehash ?? false
-    };
-  }
   return {
     context: preparedContext,
     digest: result.digest,
@@ -40236,12 +40228,9 @@ async function handlePrepareCalls(params, ctx) {
       message
     },
     capabilities: {
-      authorizeKeys: [],
-      revokeKeys: [],
       feeTotals: {},
       assetDiffs: {}
     },
-    key: callKey,
     signature: signedQuotes.signature
   };
 }
@@ -40876,10 +40865,6 @@ async function handleGetAuthorization(_params, _ctx) {
   throw new RpcError2(METHOD_NOT_IMPLEMENTED, "wallet_getAuthorization not implemented");
 }
 __name(handleGetAuthorization, "handleGetAuthorization");
-async function handleAddFaucetFunds(_params, _ctx) {
-  throw new RpcError2(METHOD_NOT_IMPLEMENTED, "wallet_addFaucetFunds not implemented");
-}
-__name(handleAddFaucetFunds, "handleAddFaucetFunds");
 
 // src/lib/erc1271.ts
 var ERC1271_SIGN_TYPEHASH = keccak256(
@@ -41019,8 +41004,7 @@ function createMethods(_env) {
     wallet_getAssets: handleGetAssets,
     wallet_getCallsHistory: handleGetCallsHistory,
     wallet_getAuthorization: handleGetAuthorization,
-    wallet_verifySignature: handleVerifySignature,
-    wallet_addFaucetFunds: handleAddFaucetFunds
+    wallet_verifySignature: handleVerifySignature
   };
 }
 __name(createMethods, "createMethods");
@@ -45445,11 +45429,17 @@ __name(isPendingTransactionIdUniqueConstraintError, "isPendingTransactionIdUniqu
 
 // src/durable-objects/signer.do.ts
 var DEFAULT_MAX_PENDING = 16;
-var BALANCE_CHECK_INTERVAL_MS = 6e4;
+var BALANCE_CHECK_INTERVAL_MS = 3e5;
 var STALE_TX_THRESHOLD_MS = 5 * 60 * 1e3;
 var DEFAULT_INTENT_EXPIRY_BUFFER_SECONDS = 30;
 var DUPLICATE_TX_WAIT_MS = 2e3;
 var DUPLICATE_TX_WAIT_POLL_MS = 100;
+function mapStoredTxStatusToPublicStatus(storedStatus) {
+  if (storedStatus === "confirmed") return "confirmed";
+  if (storedStatus === "failed" || storedStatus === "stuck") return "failed";
+  return "pending";
+}
+__name(mapStoredTxStatusToPublicStatus, "mapStoredTxStatusToPublicStatus");
 function isIntentExpired(expiryTimestamp, bufferSeconds = DEFAULT_INTENT_EXPIRY_BUFFER_SECONDS) {
   const expiry = typeof expiryTimestamp === "string" ? BigInt(expiryTimestamp) : expiryTimestamp;
   const currentTime = BigInt(Math.floor(Date.now() / 1e3));
@@ -45884,11 +45874,12 @@ var SignerDO = class extends DurableObject {
       }
     } catch {
     }
+    const fallbackStatus = mapStoredTxStatusToPublicStatus(status);
     return {
       txId,
       txHash,
       chainId,
-      status: "pending",
+      status: fallbackStatus,
       submittedAt: sentAt
     };
   }
@@ -47760,6 +47751,15 @@ var IntentNonceDO = class extends DurableObject4 {
             draftKey,
             draftTtlMs: coerceDraftTtlMs(draftTtlMs)
           });
+          if ("error" in result) {
+            return Response.json(
+              {
+                error: result.error,
+                conflictDraftId: result.conflictDraftId
+              },
+              { status: 409 }
+            );
+          }
           return Response.json({
             nonce: result.nonce.toString(),
             draftId: result.draftId,
@@ -47941,6 +47941,14 @@ var IntentNonceDO = class extends DurableObject4 {
       this.deleteExpiredDraftForSeqKey(key, nowMs);
       const existingDraft = this.getDraftForSeqKey(key);
       if (existingDraft !== null) {
+        const incomingDraftKey = options.draftKey ?? null;
+        const existingDraftKey = existingDraft.draft_key;
+        if (incomingDraftKey !== existingDraftKey) {
+          return {
+            error: "draft already exists for seqKey with a different draftKey; complete or cancel the active request first",
+            conflictDraftId: existingDraft.draft_id
+          };
+        }
         return {
           nonce: BigInt(existingDraft.nonce),
           draftId: existingDraft.draft_id,