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

package/dist/index.d.cts

@@ -334,6 +334,13 @@ interface X402Intent {
     network: string;
     /** Haven-authenticated binding over the x402 expected context. */
     expectedAuth: X402ExpectedAuth;
+    /**
+     * #1690: the payer identity Haven bound into the expected context (v3),
+     * relayed VERBATIM to the signer's wire shape. Absent until the backend
+     * flips X402_EMIT_PAYER_CONTEXT.
+     */
+    payerDelegate?: string;
+    payerAgentId?: string;
     /**
      * EIP-712 digest of `signData.typed_data`, present on the delegation rail
      * (#1138). The edge signer needs it to reconstruct the v2 expected-context
@@ -364,6 +371,16 @@ interface X402ExpectedContext {
      * this digest makes Haven's declaration cover the real payload.
      */
     typedDataHash?: string;
+    /**
+     * The DELEGATE ADDRESS this quote was created for (#1690). Present ⇒ the
+     * context is **version 3** and the signer refuses to sign when this is not
+     * its own delegate — the guard that turns "quote as agent A, sign as agent
+     * B" from an on-chain revert three layers later into a named refusal.
+     * Inside the Haven-signed message on purpose: outside it, it is forgeable.
+     */
+    payerDelegate?: string;
+    /** The paying agent's id, for the refusal message's diagnosis (#1690). */
+    payerAgentId?: string;
 }
 interface X402ExpectedAuth {
     /**
@@ -653,6 +670,36 @@ interface HavenPaymentReceipt {
     createdAt: string;
     updatedAt: string;
 }
+/**
+ * How long this SDK waits for an on-chain confirmation before it stops
+ * waiting (#1756).
+ *
+ * Lives here rather than in `client.ts` so the payment-confirmation poller
+ * and the delegate sweep share ONE number instead of forking it. The SDK's
+ * other chain waits are already bounded (`waitForFundingTx` at 30 s), so a
+ * fourth independently chosen literal is exactly the drift this constant
+ * exists to prevent.
+ */
+declare const DEFAULT_CONFIRMATION_TIMEOUT_MS = 90000;
+/**
+ * Whether a sweep transfer was observed to confirm (#1756).
+ *
+ * The distinction is the point: `unconfirmed` means the transfer was
+ * BROADCAST and may still land, which is neither success nor failure. It must
+ * never be collapsed into either — reporting a still-pending transaction as
+ * done, or as failed, are the same defect in opposite directions.
+ */
+type SweepConfirmation = 
+/** A receipt was observed. The funds are in the Safe. */
+'confirmed'
+/**
+ * Broadcast, but no receipt within `DEFAULT_CONFIRMATION_TIMEOUT_MS` (or the
+ * node returned no receipt). The transaction is still in the mempool and may
+ * mine at any time. `txHash` is the broadcast hash — check it on the
+ * explorer before re-running the sweep, and expect a re-run to find nothing
+ * stranded if it has since landed.
+ */
+ | 'unconfirmed';
 /** One transferred asset in a delegate sweep. */
 interface SweepEntry {
     /** 'USDC' or 'ETH' */
@@ -661,10 +708,24 @@ interface SweepEntry {
     amount: string;
     /** Atomic amount swept */
     amountAtomic: string;
-    /** Transaction hash of the sweep transfer */
+    /**
+     * Transaction hash of the sweep transfer.
+     *
+     * The RECEIPT hash when `confirmation` is `confirmed`; the BROADCAST hash
+     * when it is `unconfirmed` — which is the whole reason the sweep returns
+     * instead of throwing on a deadline, since this hash is the only thing that
+     * lets a user recover the transfer by hand (#1756).
+     */
     txHash: string;
     /** Block explorer URL for the tx */
     explorerUrl: string;
+    /**
+     * Did this transfer confirm on-chain within the deadline? (#1756)
+     *
+     * `unconfirmed` entries have MOVED NOTHING YET and may still move. Do not
+     * report a sweep as complete without checking this on every entry.
+     */
+    confirmation: SweepConfirmation;
 }
 /** Result of a `sweepDelegate()` call. */
 interface SweepResult {
@@ -676,6 +737,16 @@ interface SweepResult {
     chainId: number;
     /** One entry per transferred asset. Empty when nothing was stranded. */
     transfers: SweepEntry[];
+    /**
+     * True when ANY entry is `unconfirmed` — i.e. the sweep broadcast something
+     * it could not confirm within the deadline (#1756).
+     *
+     * Derived from `transfers`, and present anyway because the consumer most
+     * likely to misread this result is an LLM reading the JSON of the
+     * `haven_sweep_delegate` tool, which will otherwise see a populated
+     * `transfers` array and report the money as recovered.
+     */
+    unconfirmed: boolean;
 }
 type PaymentStateKind = 'payment_intent' | 'approval_request';
 interface AgentPaymentEnumSchema {
@@ -2016,7 +2087,7 @@ declare const toolDescriptions: {
         readonly summary: "Sweep stranded USDC and/or ETH from the delegate wallet back to the originating Safe.";
         readonly selectionGuidance: string;
         readonly behavior: string;
-        readonly nextActionGuidance: "If transfers is non-empty, confirm the amounts with the user. No further action required — funds are on their way back to the Safe.";
+        readonly nextActionGuidance: string;
     };
     readonly send: {
         readonly summary: "Send ETH or USDC directly from the agent's Haven wallet to a recipient address.";
@@ -2416,4 +2487,4 @@ declare function discoverMerchantMcpUrl(inputUrl: string): Promise<string | null
 /** Trailing-slash/percent-case echoes compare equal; unparseable never does. */
 declare function sameUrl(a: string, b: string): boolean;
 
-export { AGENT_PAYMENT_FAILURE_CODE_VALUES, AGENT_PAYMENT_NEXT_ACTION_VALUES, AGENT_PAYMENT_PHASE_VALUES, AGENT_PAYMENT_RAIL_VALUES, type AgentNextStep, type AgentPaymentEnumSchema, AgentPaymentFailureCode, AgentPaymentFailureCodeDescriptions, AgentPaymentFailureCodeSchema, AgentPaymentNextAction, AgentPaymentNextActionDescriptions, AgentPaymentNextActionSchema, AgentPaymentPhase, AgentPaymentPhaseDescriptions, AgentPaymentPhaseSchema, AgentPaymentRail, AgentPaymentRailDescriptions, AgentPaymentRailSchema, type AgentPaymentSummary, type AgentPaymentWarning, AgentPaymentWarningCode, type AgentPurchaseSummary, type ClaudeTool, DISCOVERY_MAX_BYTES, ERC7710_ASSET_TRANSFER_METHOD, HAVEN_MINIMUM_NODE_VERSION, HAVEN_SKILL_BODY_MD, HAVEN_SKILL_MD, type HavenAgent, type HavenAgentAllowanceSummary, type HavenAgentReadiness, type HavenAgentSummary, type HavenAllowance, type HavenAllowanceSummary, HavenApiError, type HavenCatalogEntry, HavenClient, type HavenClientConfig, HavenError, type HavenPaymentReceipt, HavenPaymentStateError, HavenSigningError, HavenTimeoutError, HavenUnsupportedSignerVersionError, MERCHANT_DISCOVERY_PATHS, type MachinePaymentRail, MerchantTimeoutError, type OpenAITool, type PaymentFee, type PaymentIntent, type PaymentNextAction, type PaymentPhase, type PaymentReceipt, type PaymentRequest, type PaymentResult, type PaymentResumeState, type PaymentStatus, type PaymentStatusResult, type PendingApproval, type PostPurchaseAllowanceSummary, RECEIPT_VERSION, type ReceiptVerification, type ResumeAuthorizedX402Input, type ResumeX402PaymentInput, SIGNER_UPDATE_FALLBACK, SKILL_FOLDER_NAME, SWEEP_BASE_CHAIN_ID, SWEEP_BASE_SEPOLIA_CHAIN_ID, SWEEP_BASE_SEPOLIA_USDC_ADDRESS, SWEEP_BASE_USDC_ADDRESS, type SharedToolKey, type SignData, SignerRefusalCode, type SweepAuthorization, type SweepEip712Domain, type SweepEntry, type SweepExpectedAuth, type SweepPreparation, type SweepPrepareResponse, type SweepResult, type SweepSubmitResponse, type SweepSubmitResult, type SweepTypedData, TRANSFER_WITH_AUTHORIZATION_TYPES, type ToolDescription, type UnsupportedNodeVersionMessageOptions, X402AlreadySettledError, type X402AuthorizationOptions, type X402Erc7710Settlement, type X402ExpectedAuth, type X402ExpectedContext, type X402Intent, type X402McpCallContext, type X402McpTransport, type X402MerchantCallContext, type X402PaymentHeaderContext, X402PaymentHeaderValidationError, type X402PaymentOption, type X402PaymentRequired, type X402Quote, type X402Receipt, type X402RequestSnapshot, type X402ResumeState, type X402SchemeSelection, X402UnexpectedStatusError, X402_MAX_AUTHORIZATION_WINDOW_SECONDS, X402_SETTLEMENT_FORWARD_MARGIN_SECONDS, addressFromKey, buildSweepAuthorizationMessage, buildSweepTypedData, buildX402ExpectedMessage, compareNodeVersions, composeDescription, decodeBase64Json, decodeBase64Utf8, discoverMerchantMcpUrl, encodeBase64Json, encodeBase64Utf8, encodePaymentProof, havenTools, isErc7710Option, isSupportedNodeVersion, isSweepableChain, normalizePaymentRequired, parsePaymentRequired, parsePaymentRequiredResponse, resolveTokenFromAddress, sameUrl, selectErc7710PaymentOption, selectPaymentOption, selectStandardPaymentOption, selectX402SettlementScheme, signHash, signUserOpTypedDataForDelegation, sweepUsdcAddress, sweepUsdcDomain, toStandardPaymentRequirements, toolDescriptions, unsupportedNodeVersionMessage, validateStandardX402PaymentHeader, verifyPaymentReceipt, verifySignature, x402AssetTransferMethod, x402AuthorizationAmount, x402FacilitatorAddresses };
+export { AGENT_PAYMENT_FAILURE_CODE_VALUES, AGENT_PAYMENT_NEXT_ACTION_VALUES, AGENT_PAYMENT_PHASE_VALUES, AGENT_PAYMENT_RAIL_VALUES, type AgentNextStep, type AgentPaymentEnumSchema, AgentPaymentFailureCode, AgentPaymentFailureCodeDescriptions, AgentPaymentFailureCodeSchema, AgentPaymentNextAction, AgentPaymentNextActionDescriptions, AgentPaymentNextActionSchema, AgentPaymentPhase, AgentPaymentPhaseDescriptions, AgentPaymentPhaseSchema, AgentPaymentRail, AgentPaymentRailDescriptions, AgentPaymentRailSchema, type AgentPaymentSummary, type AgentPaymentWarning, AgentPaymentWarningCode, type AgentPurchaseSummary, type ClaudeTool, DEFAULT_CONFIRMATION_TIMEOUT_MS, DISCOVERY_MAX_BYTES, ERC7710_ASSET_TRANSFER_METHOD, HAVEN_MINIMUM_NODE_VERSION, HAVEN_SKILL_BODY_MD, HAVEN_SKILL_MD, type HavenAgent, type HavenAgentAllowanceSummary, type HavenAgentReadiness, type HavenAgentSummary, type HavenAllowance, type HavenAllowanceSummary, HavenApiError, type HavenCatalogEntry, HavenClient, type HavenClientConfig, HavenError, type HavenPaymentReceipt, HavenPaymentStateError, HavenSigningError, HavenTimeoutError, HavenUnsupportedSignerVersionError, MERCHANT_DISCOVERY_PATHS, type MachinePaymentRail, MerchantTimeoutError, type OpenAITool, type PaymentFee, type PaymentIntent, type PaymentNextAction, type PaymentPhase, type PaymentReceipt, type PaymentRequest, type PaymentResult, type PaymentResumeState, type PaymentStatus, type PaymentStatusResult, type PendingApproval, type PostPurchaseAllowanceSummary, RECEIPT_VERSION, type ReceiptVerification, type ResumeAuthorizedX402Input, type ResumeX402PaymentInput, SIGNER_UPDATE_FALLBACK, SKILL_FOLDER_NAME, SWEEP_BASE_CHAIN_ID, SWEEP_BASE_SEPOLIA_CHAIN_ID, SWEEP_BASE_SEPOLIA_USDC_ADDRESS, SWEEP_BASE_USDC_ADDRESS, type SharedToolKey, type SignData, SignerRefusalCode, type SweepAuthorization, type SweepConfirmation, type SweepEip712Domain, type SweepEntry, type SweepExpectedAuth, type SweepPreparation, type SweepPrepareResponse, type SweepResult, type SweepSubmitResponse, type SweepSubmitResult, type SweepTypedData, TRANSFER_WITH_AUTHORIZATION_TYPES, type ToolDescription, type UnsupportedNodeVersionMessageOptions, X402AlreadySettledError, type X402AuthorizationOptions, type X402Erc7710Settlement, type X402ExpectedAuth, type X402ExpectedContext, type X402Intent, type X402McpCallContext, type X402McpTransport, type X402MerchantCallContext, type X402PaymentHeaderContext, X402PaymentHeaderValidationError, type X402PaymentOption, type X402PaymentRequired, type X402Quote, type X402Receipt, type X402RequestSnapshot, type X402ResumeState, type X402SchemeSelection, X402UnexpectedStatusError, X402_MAX_AUTHORIZATION_WINDOW_SECONDS, X402_SETTLEMENT_FORWARD_MARGIN_SECONDS, addressFromKey, buildSweepAuthorizationMessage, buildSweepTypedData, buildX402ExpectedMessage, compareNodeVersions, composeDescription, decodeBase64Json, decodeBase64Utf8, discoverMerchantMcpUrl, encodeBase64Json, encodeBase64Utf8, encodePaymentProof, havenTools, isErc7710Option, isSupportedNodeVersion, isSweepableChain, normalizePaymentRequired, parsePaymentRequired, parsePaymentRequiredResponse, resolveTokenFromAddress, sameUrl, selectErc7710PaymentOption, selectPaymentOption, selectStandardPaymentOption, selectX402SettlementScheme, signHash, signUserOpTypedDataForDelegation, sweepUsdcAddress, sweepUsdcDomain, toStandardPaymentRequirements, toolDescriptions, unsupportedNodeVersionMessage, validateStandardX402PaymentHeader, verifyPaymentReceipt, verifySignature, x402AssetTransferMethod, x402AuthorizationAmount, x402FacilitatorAddresses };

package/dist/index.d.ts

@@ -334,6 +334,13 @@ interface X402Intent {
     network: string;
     /** Haven-authenticated binding over the x402 expected context. */
     expectedAuth: X402ExpectedAuth;
+    /**
+     * #1690: the payer identity Haven bound into the expected context (v3),
+     * relayed VERBATIM to the signer's wire shape. Absent until the backend
+     * flips X402_EMIT_PAYER_CONTEXT.
+     */
+    payerDelegate?: string;
+    payerAgentId?: string;
     /**
      * EIP-712 digest of `signData.typed_data`, present on the delegation rail
      * (#1138). The edge signer needs it to reconstruct the v2 expected-context
@@ -364,6 +371,16 @@ interface X402ExpectedContext {
      * this digest makes Haven's declaration cover the real payload.
      */
     typedDataHash?: string;
+    /**
+     * The DELEGATE ADDRESS this quote was created for (#1690). Present ⇒ the
+     * context is **version 3** and the signer refuses to sign when this is not
+     * its own delegate — the guard that turns "quote as agent A, sign as agent
+     * B" from an on-chain revert three layers later into a named refusal.
+     * Inside the Haven-signed message on purpose: outside it, it is forgeable.
+     */
+    payerDelegate?: string;
+    /** The paying agent's id, for the refusal message's diagnosis (#1690). */
+    payerAgentId?: string;
 }
 interface X402ExpectedAuth {
     /**
@@ -653,6 +670,36 @@ interface HavenPaymentReceipt {
     createdAt: string;
     updatedAt: string;
 }
+/**
+ * How long this SDK waits for an on-chain confirmation before it stops
+ * waiting (#1756).
+ *
+ * Lives here rather than in `client.ts` so the payment-confirmation poller
+ * and the delegate sweep share ONE number instead of forking it. The SDK's
+ * other chain waits are already bounded (`waitForFundingTx` at 30 s), so a
+ * fourth independently chosen literal is exactly the drift this constant
+ * exists to prevent.
+ */
+declare const DEFAULT_CONFIRMATION_TIMEOUT_MS = 90000;
+/**
+ * Whether a sweep transfer was observed to confirm (#1756).
+ *
+ * The distinction is the point: `unconfirmed` means the transfer was
+ * BROADCAST and may still land, which is neither success nor failure. It must
+ * never be collapsed into either — reporting a still-pending transaction as
+ * done, or as failed, are the same defect in opposite directions.
+ */
+type SweepConfirmation = 
+/** A receipt was observed. The funds are in the Safe. */
+'confirmed'
+/**
+ * Broadcast, but no receipt within `DEFAULT_CONFIRMATION_TIMEOUT_MS` (or the
+ * node returned no receipt). The transaction is still in the mempool and may
+ * mine at any time. `txHash` is the broadcast hash — check it on the
+ * explorer before re-running the sweep, and expect a re-run to find nothing
+ * stranded if it has since landed.
+ */
+ | 'unconfirmed';
 /** One transferred asset in a delegate sweep. */
 interface SweepEntry {
     /** 'USDC' or 'ETH' */
@@ -661,10 +708,24 @@ interface SweepEntry {
     amount: string;
     /** Atomic amount swept */
     amountAtomic: string;
-    /** Transaction hash of the sweep transfer */
+    /**
+     * Transaction hash of the sweep transfer.
+     *
+     * The RECEIPT hash when `confirmation` is `confirmed`; the BROADCAST hash
+     * when it is `unconfirmed` — which is the whole reason the sweep returns
+     * instead of throwing on a deadline, since this hash is the only thing that
+     * lets a user recover the transfer by hand (#1756).
+     */
     txHash: string;
     /** Block explorer URL for the tx */
     explorerUrl: string;
+    /**
+     * Did this transfer confirm on-chain within the deadline? (#1756)
+     *
+     * `unconfirmed` entries have MOVED NOTHING YET and may still move. Do not
+     * report a sweep as complete without checking this on every entry.
+     */
+    confirmation: SweepConfirmation;
 }
 /** Result of a `sweepDelegate()` call. */
 interface SweepResult {
@@ -676,6 +737,16 @@ interface SweepResult {
     chainId: number;
     /** One entry per transferred asset. Empty when nothing was stranded. */
     transfers: SweepEntry[];
+    /**
+     * True when ANY entry is `unconfirmed` — i.e. the sweep broadcast something
+     * it could not confirm within the deadline (#1756).
+     *
+     * Derived from `transfers`, and present anyway because the consumer most
+     * likely to misread this result is an LLM reading the JSON of the
+     * `haven_sweep_delegate` tool, which will otherwise see a populated
+     * `transfers` array and report the money as recovered.
+     */
+    unconfirmed: boolean;
 }
 type PaymentStateKind = 'payment_intent' | 'approval_request';
 interface AgentPaymentEnumSchema {
@@ -2016,7 +2087,7 @@ declare const toolDescriptions: {
         readonly summary: "Sweep stranded USDC and/or ETH from the delegate wallet back to the originating Safe.";
         readonly selectionGuidance: string;
         readonly behavior: string;
-        readonly nextActionGuidance: "If transfers is non-empty, confirm the amounts with the user. No further action required — funds are on their way back to the Safe.";
+        readonly nextActionGuidance: string;
     };
     readonly send: {
         readonly summary: "Send ETH or USDC directly from the agent's Haven wallet to a recipient address.";
@@ -2416,4 +2487,4 @@ declare function discoverMerchantMcpUrl(inputUrl: string): Promise<string | null
 /** Trailing-slash/percent-case echoes compare equal; unparseable never does. */
 declare function sameUrl(a: string, b: string): boolean;
 
-export { AGENT_PAYMENT_FAILURE_CODE_VALUES, AGENT_PAYMENT_NEXT_ACTION_VALUES, AGENT_PAYMENT_PHASE_VALUES, AGENT_PAYMENT_RAIL_VALUES, type AgentNextStep, type AgentPaymentEnumSchema, AgentPaymentFailureCode, AgentPaymentFailureCodeDescriptions, AgentPaymentFailureCodeSchema, AgentPaymentNextAction, AgentPaymentNextActionDescriptions, AgentPaymentNextActionSchema, AgentPaymentPhase, AgentPaymentPhaseDescriptions, AgentPaymentPhaseSchema, AgentPaymentRail, AgentPaymentRailDescriptions, AgentPaymentRailSchema, type AgentPaymentSummary, type AgentPaymentWarning, AgentPaymentWarningCode, type AgentPurchaseSummary, type ClaudeTool, DISCOVERY_MAX_BYTES, ERC7710_ASSET_TRANSFER_METHOD, HAVEN_MINIMUM_NODE_VERSION, HAVEN_SKILL_BODY_MD, HAVEN_SKILL_MD, type HavenAgent, type HavenAgentAllowanceSummary, type HavenAgentReadiness, type HavenAgentSummary, type HavenAllowance, type HavenAllowanceSummary, HavenApiError, type HavenCatalogEntry, HavenClient, type HavenClientConfig, HavenError, type HavenPaymentReceipt, HavenPaymentStateError, HavenSigningError, HavenTimeoutError, HavenUnsupportedSignerVersionError, MERCHANT_DISCOVERY_PATHS, type MachinePaymentRail, MerchantTimeoutError, type OpenAITool, type PaymentFee, type PaymentIntent, type PaymentNextAction, type PaymentPhase, type PaymentReceipt, type PaymentRequest, type PaymentResult, type PaymentResumeState, type PaymentStatus, type PaymentStatusResult, type PendingApproval, type PostPurchaseAllowanceSummary, RECEIPT_VERSION, type ReceiptVerification, type ResumeAuthorizedX402Input, type ResumeX402PaymentInput, SIGNER_UPDATE_FALLBACK, SKILL_FOLDER_NAME, SWEEP_BASE_CHAIN_ID, SWEEP_BASE_SEPOLIA_CHAIN_ID, SWEEP_BASE_SEPOLIA_USDC_ADDRESS, SWEEP_BASE_USDC_ADDRESS, type SharedToolKey, type SignData, SignerRefusalCode, type SweepAuthorization, type SweepEip712Domain, type SweepEntry, type SweepExpectedAuth, type SweepPreparation, type SweepPrepareResponse, type SweepResult, type SweepSubmitResponse, type SweepSubmitResult, type SweepTypedData, TRANSFER_WITH_AUTHORIZATION_TYPES, type ToolDescription, type UnsupportedNodeVersionMessageOptions, X402AlreadySettledError, type X402AuthorizationOptions, type X402Erc7710Settlement, type X402ExpectedAuth, type X402ExpectedContext, type X402Intent, type X402McpCallContext, type X402McpTransport, type X402MerchantCallContext, type X402PaymentHeaderContext, X402PaymentHeaderValidationError, type X402PaymentOption, type X402PaymentRequired, type X402Quote, type X402Receipt, type X402RequestSnapshot, type X402ResumeState, type X402SchemeSelection, X402UnexpectedStatusError, X402_MAX_AUTHORIZATION_WINDOW_SECONDS, X402_SETTLEMENT_FORWARD_MARGIN_SECONDS, addressFromKey, buildSweepAuthorizationMessage, buildSweepTypedData, buildX402ExpectedMessage, compareNodeVersions, composeDescription, decodeBase64Json, decodeBase64Utf8, discoverMerchantMcpUrl, encodeBase64Json, encodeBase64Utf8, encodePaymentProof, havenTools, isErc7710Option, isSupportedNodeVersion, isSweepableChain, normalizePaymentRequired, parsePaymentRequired, parsePaymentRequiredResponse, resolveTokenFromAddress, sameUrl, selectErc7710PaymentOption, selectPaymentOption, selectStandardPaymentOption, selectX402SettlementScheme, signHash, signUserOpTypedDataForDelegation, sweepUsdcAddress, sweepUsdcDomain, toStandardPaymentRequirements, toolDescriptions, unsupportedNodeVersionMessage, validateStandardX402PaymentHeader, verifyPaymentReceipt, verifySignature, x402AssetTransferMethod, x402AuthorizationAmount, x402FacilitatorAddresses };
+export { AGENT_PAYMENT_FAILURE_CODE_VALUES, AGENT_PAYMENT_NEXT_ACTION_VALUES, AGENT_PAYMENT_PHASE_VALUES, AGENT_PAYMENT_RAIL_VALUES, type AgentNextStep, type AgentPaymentEnumSchema, AgentPaymentFailureCode, AgentPaymentFailureCodeDescriptions, AgentPaymentFailureCodeSchema, AgentPaymentNextAction, AgentPaymentNextActionDescriptions, AgentPaymentNextActionSchema, AgentPaymentPhase, AgentPaymentPhaseDescriptions, AgentPaymentPhaseSchema, AgentPaymentRail, AgentPaymentRailDescriptions, AgentPaymentRailSchema, type AgentPaymentSummary, type AgentPaymentWarning, AgentPaymentWarningCode, type AgentPurchaseSummary, type ClaudeTool, DEFAULT_CONFIRMATION_TIMEOUT_MS, DISCOVERY_MAX_BYTES, ERC7710_ASSET_TRANSFER_METHOD, HAVEN_MINIMUM_NODE_VERSION, HAVEN_SKILL_BODY_MD, HAVEN_SKILL_MD, type HavenAgent, type HavenAgentAllowanceSummary, type HavenAgentReadiness, type HavenAgentSummary, type HavenAllowance, type HavenAllowanceSummary, HavenApiError, type HavenCatalogEntry, HavenClient, type HavenClientConfig, HavenError, type HavenPaymentReceipt, HavenPaymentStateError, HavenSigningError, HavenTimeoutError, HavenUnsupportedSignerVersionError, MERCHANT_DISCOVERY_PATHS, type MachinePaymentRail, MerchantTimeoutError, type OpenAITool, type PaymentFee, type PaymentIntent, type PaymentNextAction, type PaymentPhase, type PaymentReceipt, type PaymentRequest, type PaymentResult, type PaymentResumeState, type PaymentStatus, type PaymentStatusResult, type PendingApproval, type PostPurchaseAllowanceSummary, RECEIPT_VERSION, type ReceiptVerification, type ResumeAuthorizedX402Input, type ResumeX402PaymentInput, SIGNER_UPDATE_FALLBACK, SKILL_FOLDER_NAME, SWEEP_BASE_CHAIN_ID, SWEEP_BASE_SEPOLIA_CHAIN_ID, SWEEP_BASE_SEPOLIA_USDC_ADDRESS, SWEEP_BASE_USDC_ADDRESS, type SharedToolKey, type SignData, SignerRefusalCode, type SweepAuthorization, type SweepConfirmation, type SweepEip712Domain, type SweepEntry, type SweepExpectedAuth, type SweepPreparation, type SweepPrepareResponse, type SweepResult, type SweepSubmitResponse, type SweepSubmitResult, type SweepTypedData, TRANSFER_WITH_AUTHORIZATION_TYPES, type ToolDescription, type UnsupportedNodeVersionMessageOptions, X402AlreadySettledError, type X402AuthorizationOptions, type X402Erc7710Settlement, type X402ExpectedAuth, type X402ExpectedContext, type X402Intent, type X402McpCallContext, type X402McpTransport, type X402MerchantCallContext, type X402PaymentHeaderContext, X402PaymentHeaderValidationError, type X402PaymentOption, type X402PaymentRequired, type X402Quote, type X402Receipt, type X402RequestSnapshot, type X402ResumeState, type X402SchemeSelection, X402UnexpectedStatusError, X402_MAX_AUTHORIZATION_WINDOW_SECONDS, X402_SETTLEMENT_FORWARD_MARGIN_SECONDS, addressFromKey, buildSweepAuthorizationMessage, buildSweepTypedData, buildX402ExpectedMessage, compareNodeVersions, composeDescription, decodeBase64Json, decodeBase64Utf8, discoverMerchantMcpUrl, encodeBase64Json, encodeBase64Utf8, encodePaymentProof, havenTools, isErc7710Option, isSupportedNodeVersion, isSweepableChain, normalizePaymentRequired, parsePaymentRequired, parsePaymentRequiredResponse, resolveTokenFromAddress, sameUrl, selectErc7710PaymentOption, selectPaymentOption, selectStandardPaymentOption, selectX402SettlementScheme, signHash, signUserOpTypedDataForDelegation, sweepUsdcAddress, sweepUsdcDomain, toStandardPaymentRequirements, toolDescriptions, unsupportedNodeVersionMessage, validateStandardX402PaymentHeader, verifyPaymentReceipt, verifySignature, x402AssetTransferMethod, x402AuthorizationAmount, x402FacilitatorAddresses };

package/dist/index.js

@@ -8,6 +8,7 @@ import { privateKeyToAccount } from '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",
@@ -759,7 +760,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",
@@ -777,6 +778,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)}`;
 }
@@ -1625,6 +1632,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;
@@ -1644,9 +1665,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);
@@ -1655,12 +1675,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", {});
@@ -2637,7 +2656,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;
@@ -2712,7 +2730,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) {
@@ -2883,6 +2901,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
@@ -3777,8 +3797,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.",
@@ -4290,6 +4310,6 @@ function sameUrl(a, b) {
   }
 }
 
-export { AGENT_PAYMENT_FAILURE_CODE_VALUES, AGENT_PAYMENT_NEXT_ACTION_VALUES, AGENT_PAYMENT_PHASE_VALUES, AGENT_PAYMENT_RAIL_VALUES, AgentPaymentFailureCode, AgentPaymentFailureCodeDescriptions, AgentPaymentFailureCodeSchema, AgentPaymentNextAction, AgentPaymentNextActionDescriptions, AgentPaymentNextActionSchema, AgentPaymentPhase, AgentPaymentPhaseDescriptions, AgentPaymentPhaseSchema, AgentPaymentRail, AgentPaymentRailDescriptions, AgentPaymentRailSchema, AgentPaymentWarningCode, DISCOVERY_MAX_BYTES, ERC7710_ASSET_TRANSFER_METHOD, HAVEN_MINIMUM_NODE_VERSION, HAVEN_SKILL_BODY_MD, HAVEN_SKILL_MD, HavenApiError, HavenClient, HavenError, HavenPaymentStateError, HavenSigningError, HavenTimeoutError, HavenUnsupportedSignerVersionError, MERCHANT_DISCOVERY_PATHS, MerchantTimeoutError, RECEIPT_VERSION, SIGNER_UPDATE_FALLBACK, SKILL_FOLDER_NAME, SWEEP_BASE_CHAIN_ID, SWEEP_BASE_SEPOLIA_CHAIN_ID, SWEEP_BASE_SEPOLIA_USDC_ADDRESS, SWEEP_BASE_USDC_ADDRESS, SignerRefusalCode, TRANSFER_WITH_AUTHORIZATION_TYPES, X402AlreadySettledError, X402PaymentHeaderValidationError, X402UnexpectedStatusError, X402_MAX_AUTHORIZATION_WINDOW_SECONDS, X402_SETTLEMENT_FORWARD_MARGIN_SECONDS, addressFromKey, buildSweepAuthorizationMessage, buildSweepTypedData, buildX402ExpectedMessage, compareNodeVersions, composeDescription, decodeBase64Json, decodeBase64Utf8, discoverMerchantMcpUrl, encodeBase64Json, encodeBase64Utf8, encodePaymentProof, havenTools, isErc7710Option, isSupportedNodeVersion, isSweepableChain, normalizePaymentRequired, parsePaymentRequired, parsePaymentRequiredResponse, resolveTokenFromAddress, sameUrl, selectErc7710PaymentOption, selectPaymentOption, selectStandardPaymentOption, selectX402SettlementScheme, signHash, signUserOpTypedDataForDelegation, sweepUsdcAddress, sweepUsdcDomain, toStandardPaymentRequirements, toolDescriptions, unsupportedNodeVersionMessage, validateStandardX402PaymentHeader, verifyPaymentReceipt, verifySignature, x402AssetTransferMethod, x402AuthorizationAmount, x402FacilitatorAddresses };
+export { AGENT_PAYMENT_FAILURE_CODE_VALUES, AGENT_PAYMENT_NEXT_ACTION_VALUES, AGENT_PAYMENT_PHASE_VALUES, AGENT_PAYMENT_RAIL_VALUES, AgentPaymentFailureCode, AgentPaymentFailureCodeDescriptions, AgentPaymentFailureCodeSchema, AgentPaymentNextAction, AgentPaymentNextActionDescriptions, AgentPaymentNextActionSchema, AgentPaymentPhase, AgentPaymentPhaseDescriptions, AgentPaymentPhaseSchema, AgentPaymentRail, AgentPaymentRailDescriptions, AgentPaymentRailSchema, AgentPaymentWarningCode, DEFAULT_CONFIRMATION_TIMEOUT_MS, DISCOVERY_MAX_BYTES, ERC7710_ASSET_TRANSFER_METHOD, HAVEN_MINIMUM_NODE_VERSION, HAVEN_SKILL_BODY_MD, HAVEN_SKILL_MD, HavenApiError, HavenClient, HavenError, HavenPaymentStateError, HavenSigningError, HavenTimeoutError, HavenUnsupportedSignerVersionError, MERCHANT_DISCOVERY_PATHS, MerchantTimeoutError, RECEIPT_VERSION, SIGNER_UPDATE_FALLBACK, SKILL_FOLDER_NAME, SWEEP_BASE_CHAIN_ID, SWEEP_BASE_SEPOLIA_CHAIN_ID, SWEEP_BASE_SEPOLIA_USDC_ADDRESS, SWEEP_BASE_USDC_ADDRESS, SignerRefusalCode, TRANSFER_WITH_AUTHORIZATION_TYPES, X402AlreadySettledError, X402PaymentHeaderValidationError, X402UnexpectedStatusError, X402_MAX_AUTHORIZATION_WINDOW_SECONDS, X402_SETTLEMENT_FORWARD_MARGIN_SECONDS, addressFromKey, buildSweepAuthorizationMessage, buildSweepTypedData, buildX402ExpectedMessage, compareNodeVersions, composeDescription, decodeBase64Json, decodeBase64Utf8, discoverMerchantMcpUrl, encodeBase64Json, encodeBase64Utf8, encodePaymentProof, havenTools, isErc7710Option, isSupportedNodeVersion, isSweepableChain, normalizePaymentRequired, parsePaymentRequired, parsePaymentRequiredResponse, resolveTokenFromAddress, sameUrl, selectErc7710PaymentOption, selectPaymentOption, selectStandardPaymentOption, selectX402SettlementScheme, signHash, signUserOpTypedDataForDelegation, sweepUsdcAddress, sweepUsdcDomain, toStandardPaymentRequirements, toolDescriptions, unsupportedNodeVersionMessage, validateStandardX402PaymentHeader, verifyPaymentReceipt, verifySignature, x402AssetTransferMethod, x402AuthorizationAmount, x402FacilitatorAddresses };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map