@haven_ai/sdk 0.1.28-alpha.0 → 0.1.29-alpha.0

package/dist/index.cjs

@@ -10,6 +10,7 @@ var accounts = require('viem/accounts');
 // src/client.ts
 
 // src/types.ts
+var DEFAULT_CONFIRMATION_TIMEOUT_MS = 9e4;
 var AgentPaymentPhase = {
   /** The agent must sign and submit the prepared payment before Haven can relay it. */
   AgentSignatureRequired: "agent_signature_required",
@@ -761,7 +762,7 @@ function x402AuthorizationAmount(option) {
   return amount;
 }
 function buildX402ExpectedMessage(context) {
-  const version = context.typedDataHash ? 2 : 1;
+  const version = context.payerDelegate ? 3 : context.typedDataHash ? 2 : 1;
   const payload = {
     version,
     kind: "haven.x402.expected",
@@ -779,6 +780,12 @@ function buildX402ExpectedMessage(context) {
   if (context.typedDataHash) {
     payload.typedDataHash = context.typedDataHash.toLowerCase();
   }
+  if (context.payerDelegate) {
+    payload.payerDelegate = context.payerDelegate.toLowerCase();
+    if (context.payerAgentId) {
+      payload.payerAgentId = context.payerAgentId;
+    }
+  }
   return `Haven x402 expected context v${version}
 ${stableStringify2(payload)}`;
 }
@@ -1627,6 +1634,20 @@ function createErc20Contract(address, abi, runner) {
 }
 
 // src/delegate-sweep.ts
+function isWaitTimeout(err) {
+  return err?.code === "TIMEOUT";
+}
+async function waitForSweepTx(tx) {
+  let receipt;
+  try {
+    receipt = await tx.wait(1, DEFAULT_CONFIRMATION_TIMEOUT_MS);
+  } catch (err) {
+    if (!isWaitTimeout(err)) throw err;
+    return { txHash: tx.hash, confirmation: "unconfirmed" };
+  }
+  if (!receipt) return { txHash: tx.hash, confirmation: "unconfirmed" };
+  return { txHash: receipt.hash, confirmation: "confirmed" };
+}
 var DelegateSweepApi = class {
   constructor(options) {
     this.options = options;
@@ -1646,9 +1667,8 @@ var DelegateSweepApi = class {
       const balance2 = await contract.balanceOf(agent.delegateAddress);
       if (balance2 > 0n) {
         const tx = await contract.transfer(agent.safeAddress, balance2);
-        const receipt = await tx.wait(1);
-        const txHash = receipt?.hash ?? tx.hash;
-        transfers.push({ asset: "USDC", amount: format(balance2, 6), amountAtomic: balance2.toString(), txHash, explorerUrl: this.options.buildExplorerUrl(agent.chainId, txHash) });
+        const { txHash, confirmation } = await waitForSweepTx(tx);
+        transfers.push({ asset: "USDC", amount: format(balance2, 6), amountAtomic: balance2.toString(), txHash, explorerUrl: this.options.buildExplorerUrl(agent.chainId, txHash), confirmation });
       }
     }
     const balance = await provider.getBalance(agent.delegateAddress);
@@ -1657,12 +1677,11 @@ var DelegateSweepApi = class {
       const send = balance - (fee.maxFeePerGas ?? fee.gasPrice ?? 1000000n) * 21000n * 2n;
       if (send > 0n) {
         const tx = await wallet.sendTransaction({ to: agent.safeAddress, value: send });
-        const receipt = await tx.wait(1);
-        const txHash = receipt?.hash ?? tx.hash;
-        transfers.push({ asset: "ETH", amount: format(send, 18), amountAtomic: send.toString(), txHash, explorerUrl: this.options.buildExplorerUrl(agent.chainId, txHash) });
+        const { txHash, confirmation } = await waitForSweepTx(tx);
+        transfers.push({ asset: "ETH", amount: format(send, 18), amountAtomic: send.toString(), txHash, explorerUrl: this.options.buildExplorerUrl(agent.chainId, txHash), confirmation });
       }
     }
-    return { fromAddress: agent.delegateAddress, toAddress: agent.safeAddress, chainId: agent.chainId, transfers };
+    return { fromAddress: agent.delegateAddress, toAddress: agent.safeAddress, chainId: agent.chainId, transfers, unconfirmed: transfers.some((t) => t.confirmation === "unconfirmed") };
   }
   prepareSweep() {
     return this.options.transport.post("/machine-payments/sweep/prepare", {});
@@ -2639,7 +2658,6 @@ function parseProtocolReceiptHeader(value) {
 }
 
 // src/client.ts
-var DEFAULT_CONFIRMATION_TIMEOUT = 9e4;
 var DEFAULT_POLLING_INTERVAL = 3e3;
 function x402TypedDataDigest(typedData) {
   if (!typedData || typeof typedData !== "object") return void 0;
@@ -2714,7 +2732,7 @@ var HavenClient = class {
     });
     this.x402Wallet = config.x402Wallet;
     this.merchantTransport = new McpMerchantTransport({ merchantTimeout: config.merchantTimeout });
-    this.confirmationTimeout = config.confirmationTimeout ?? DEFAULT_CONFIRMATION_TIMEOUT;
+    this.confirmationTimeout = config.confirmationTimeout ?? DEFAULT_CONFIRMATION_TIMEOUT_MS;
     this.pollingInterval = config.pollingInterval ?? DEFAULT_POLLING_INTERVAL;
     this.chainRpcs = config.chainRpcs ?? {};
     if (this.delegateKey) {
@@ -2885,6 +2903,8 @@ var HavenClient = class {
       asset: option.asset,
       network: option.network,
       expectedAuth: raw.x402_expected_auth,
+      payerDelegate: raw.payer_delegate,
+      payerAgentId: raw.payer_agent_id,
       // #1138: the digest the delegation-rail expected context commits to.
       // Re-derived locally, exactly like every other context field the edge
       // signer is handed (amount, merchantTo, …) — none of them are trusted
@@ -3779,8 +3799,8 @@ var toolDescriptions = {
   sweep_delegate: {
     summary: "Sweep stranded USDC and/or ETH from the delegate wallet back to the originating Safe.",
     selectionGuidance: "Use this when the user instructs you to recover stranded funds on the delegate wallet, or when a payment status returns nextAction=sweep_stranded_funds. Do NOT use for normal payments \u2014 use haven_pay_x402. Do NOT use to read balances only \u2014 use haven_get_allowances.",
-    behavior: "Reads the delegate EOA's on-chain USDC and ETH balances. For each non-zero balance, signs and submits a transfer from the delegate EOA to the originating Safe (hardcoded destination). The delegate key signs locally \u2014 Haven never sees it and the backend never constructs signed transactions (CASP/MiCA Red Line #2). Returns tx hashes and recovered amounts. Returns an empty transfers list when nothing is stranded.",
-    nextActionGuidance: "If transfers is non-empty, confirm the amounts with the user. No further action required \u2014 funds are on their way back to the Safe."
+    behavior: `Reads the delegate EOA's on-chain USDC and ETH balances. For each non-zero balance, signs and submits a transfer from the delegate EOA to the originating Safe (hardcoded destination). The delegate key signs locally \u2014 Haven never sees it and the backend never constructs signed transactions (CASP/MiCA Red Line #2). Returns tx hashes and recovered amounts. Returns an empty transfers list when nothing is stranded. Each transfer carries confirmation: "confirmed" (a receipt was seen \u2014 the funds are in the Safe) or "unconfirmed" (broadcast but not confirmed within 90 seconds \u2014 still in the mempool, may still land). The top-level unconfirmed flag is true when any transfer is unconfirmed.`,
+    nextActionGuidance: 'If transfers is non-empty, confirm the amounts with the user. Report a transfer as recovered ONLY when its confirmation is "confirmed". For an "unconfirmed" transfer, tell the user it was submitted but not yet confirmed, give them its txHash and explorerUrl to check, and do not re-run the sweep immediately \u2014 a re-run after it lands will simply find nothing stranded.'
   },
   send: {
     summary: "Send ETH or USDC directly from the agent's Haven wallet to a recipient address.",
@@ -4309,6 +4329,7 @@ exports.AgentPaymentRail = AgentPaymentRail;
 exports.AgentPaymentRailDescriptions = AgentPaymentRailDescriptions;
 exports.AgentPaymentRailSchema = AgentPaymentRailSchema;
 exports.AgentPaymentWarningCode = AgentPaymentWarningCode;
+exports.DEFAULT_CONFIRMATION_TIMEOUT_MS = DEFAULT_CONFIRMATION_TIMEOUT_MS;
 exports.DISCOVERY_MAX_BYTES = DISCOVERY_MAX_BYTES;
 exports.ERC7710_ASSET_TRANSFER_METHOD = ERC7710_ASSET_TRANSFER_METHOD;
 exports.HAVEN_MINIMUM_NODE_VERSION = HAVEN_MINIMUM_NODE_VERSION;