npm - @rubicon-caliga/agent-sdk - Versions diffs - 0.1.1 → 0.1.2 - Mend

@rubicon-caliga/agent-sdk 0.1.1 → 0.1.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (15) hide show

package/README.md +21 -5
package/dist/agent-client.test.d.ts +2 -0
package/dist/agent-client.test.d.ts.map +1 -0
package/dist/agent-client.test.js +110 -0
package/dist/agent-client.test.js.map +1 -0
package/dist/circle-cli-gateway-payment.d.ts +43 -0
package/dist/circle-cli-gateway-payment.d.ts.map +1 -1
package/dist/circle-cli-gateway-payment.js +42 -9
package/dist/circle-cli-gateway-payment.js.map +1 -1
package/dist/circle-cli-gateway-payment.test.js +110 -1
package/dist/circle-cli-gateway-payment.test.js.map +1 -1
package/package.json +1 -1
package/src/agent-client.test.ts +118 -0
package/src/circle-cli-gateway-payment.test.ts +129 -0
package/src/circle-cli-gateway-payment.ts +64 -10

package/README.md CHANGED Viewed

@@ -20,7 +20,7 @@ const hasCircleCliWallet = process.env.CIRCLE_AGENT_WALLET_ADDRESS;
 const rubicon = new Rubicon({
   paymentEngine: hasCircleCliWallet
     ? new CircleCliGatewayPaymentEngine({
-        walletAddress: process.env.CIRCLE_AGENT_WALLET_ADDRESS as `0x${string}`,
+        agentWalletAddress: process.env.CIRCLE_AGENT_WALLET_ADDRESS as `0x${string}`,
       })
     : new StaticPaymentEngine(),
 });
@@ -88,16 +88,32 @@ import Rubicon, { CircleCliGatewayPaymentEngine } from "@rubicon-caliga/agent-sd
 const rubicon = new Rubicon({
   baseUrl: process.env.RUBICON_GATEWAY_URL,
   paymentEngine: new CircleCliGatewayPaymentEngine({
-    walletAddress: process.env.CIRCLE_AGENT_WALLET_ADDRESS as `0x${string}` | undefined,
+    agentWalletAddress: process.env.CIRCLE_AGENT_WALLET_ADDRESS as `0x${string}` | undefined,
     chain: "ARC-TESTNET",
   }),
 });
 ```
-When `walletAddress` is omitted, the engine runs
+`CircleCliGatewayPaymentEngine` keeps two addresses distinct:
+- `agentWalletAddress` is the Circle Agent Wallet passed to
+  `circle wallet sign typed-data --address`.
+- `buyerWalletAddress` / `backingEOA` is the Gateway backing EOA used as the
+  x402 `TransferWithAuthorization.from` address.
+When only `agentWalletAddress` is provided, the engine discovers the backing EOA
+with `circle gateway balance --address <agentWalletAddress> --chain ARC-TESTNET --output json`.
+When no address is provided, the engine first runs
 `circle wallet list --chain ARC-TESTNET --type agent --output json` and uses the
-sole Agent Wallet it finds. If multiple wallets are present, pass the address
-explicitly.
+sole Agent Wallet it finds, then discovers its backing EOA with Gateway balance.
+The older `walletAddress` option remains as an alias for `agentWalletAddress`.
+If multiple Agent Wallets are present, pass the agent wallet explicitly.
+Gateway/Nanopayments receipts may have empty `transactionHashes`. Treat
+`settlementIds` as the primary proof of payment; scanner visibility is not
+guaranteed because a successful nanopayment may not appear as a direct ERC-20
+transfer to the seller. Seller dashboards should count Rubicon backend payment
+receipts and Circle Gateway settlement IDs, not direct on-chain transfers.
 The lower-level API-backed custody path is also available:

package/dist/agent-client.test.d.ts ADDED Viewed

	@@ -0,0 +1,2 @@
1	+ export {};
2	+ //# sourceMappingURL=agent-client.test.d.ts.map

package/dist/agent-client.test.d.ts.map ADDED Viewed

	@@ -0,0 +1 @@
1	+ {"version":3,"file":"agent-client.test.d.ts","sourceRoot":"","sources":["../src/agent-client.test.ts"],"names":[],"mappings":""}

package/dist/agent-client.test.js ADDED Viewed

@@ -0,0 +1,110 @@
+import { test } from "node:test";
+import assert from "node:assert/strict";
+import { RubiconClient } from "./agent-client.js";
+const paymentEngine = {
+    async createWordPayment() {
+        return { paymentPayload: { ok: true } };
+    },
+};
+test("run receipt preserves Gateway settlement receipt fields", async () => {
+    const fetcher = (async (input) => {
+        const url = String(input);
+        if (url.endsWith("/v1/sessions")) {
+            return jsonResponse({
+                sessionId: "session_1",
+                state: "active",
+                article: article(),
+                navigation: navigation(),
+                pricePerWordAtomic: "1",
+                maxArticlePriceAtomic: "10",
+                conversationId: "conversation_1",
+                wordPaymentAtomic: "1",
+                gatewayFeeBps: 0,
+                paymentRequired: { scheme: "exact" },
+                expiresAt: "2026-06-18T12:00:00.000Z",
+                wordsPaid: 0,
+                wordsDelivered: 0,
+                paidAtomic: "0",
+            });
+        }
+        if (url.endsWith("/v1/sessions/session_1/payments")) {
+            return jsonResponse({
+                accepted: true,
+                sequence: 0,
+                word: "Rubicon",
+                priceAtomic: "1",
+                wordsPaid: 1,
+                wordsDelivered: 1,
+                paidAtomic: "1",
+                completed: true,
+                transactionHashes: [],
+                settlementIds: ["settlement_1"],
+                payment: {
+                    paymentId: "payment_1",
+                    sessionId: "session_1",
+                    articleId: "article_1",
+                    sequence: 0,
+                    meteringUnit: "word",
+                    amountAtomic: "1",
+                    currency: "USDC",
+                    network: "eip155:5042002",
+                    payTo: "0x3333333333333333333333333333333333333333",
+                    transactionHashes: [],
+                    settlementIds: ["settlement_1"],
+                    buyerWalletAddress: "0x2222222222222222222222222222222222222222",
+                    settledAt: "2026-06-18T12:00:00.000Z",
+                },
+            });
+        }
+        throw new Error(`Unexpected fetch: ${url}`);
+    });
+    const client = new RubiconClient({
+        baseUrl: "http://rubicon.test",
+        paymentEngine,
+        fetch: fetcher,
+    });
+    const receipt = await client.run({
+        articleId: "article_1",
+        maxSpendAtomic: "10",
+    });
+    assert.deepEqual(receipt.transactionHashes, []);
+    assert.deepEqual(receipt.settlementIds, ["settlement_1"]);
+    assert.equal(receipt.buyerWalletAddress, "0x2222222222222222222222222222222222222222");
+    assert.equal(receipt.sellerPayTo, "0x3333333333333333333333333333333333333333");
+    assert.equal(receipt.network, "eip155:5042002");
+});
+function jsonResponse(body) {
+    return new Response(JSON.stringify(body), {
+        status: 200,
+        headers: { "content-type": "application/json" },
+    });
+}
+function article() {
+    return {
+        articleId: "article_1",
+        creatorId: "creator_1",
+        creatorUsername: "creator",
+        title: "Title",
+        author: "Author",
+        state: "published",
+        totalWords: 1,
+        pricePerWordAtomic: "1",
+        maxArticlePriceAtomic: "1",
+        sections: [],
+    };
+}
+function navigation() {
+    return {
+        articleId: "article_1",
+        sections: [],
+        sellerAgent: {
+            recommendedSectionId: "intro",
+            alternativeSectionIds: [],
+            rationale: "",
+            safeHints: [],
+            withheld: [],
+        },
+        stopConditions: [],
+    };
+}
+//# sourceMappingURL=agent-client.test.js.map

package/dist/agent-client.test.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"agent-client.test.js","sourceRoot":"","sources":["../src/agent-client.test.ts"],"names":[],"mappings":"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"}

package/dist/circle-cli-gateway-payment.d.ts CHANGED Viewed

@@ -5,8 +5,24 @@ export interface CircleCliGatewayPaymentEngineOptions {
     /**
      * Agent Wallet address controlled by Circle CLI. When omitted, the engine
      * resolves the sole agent wallet returned by `circle wallet list`.
+     *
+     * @deprecated Use `agentWalletAddress`. This alias is kept for existing SDK
+     * callers and is treated as the Circle CLI signing wallet, not the x402
+     * authorization `from` address.
      */
     walletAddress?: `0x${string}`;
+    /**
+     * Agent Wallet address controlled by Circle CLI. This is passed to
+     * `circle wallet sign typed-data --address`.
+     */
+    agentWalletAddress?: `0x${string}`;
+    /**
+     * Gateway backing EOA used as the x402 authorization `from` address. When
+     * omitted, the engine resolves it from `circle gateway balance`.
+     */
+    buyerWalletAddress?: `0x${string}`;
+    /** Alias for `buyerWalletAddress`. */
+    backingEOA?: `0x${string}`;
     /** Circle CLI chain name. Rubicon real reads settle on Arc Testnet by default. */
     chain?: string;
     /** Circle CLI binary name or path. */
@@ -14,6 +30,12 @@ export interface CircleCliGatewayPaymentEngineOptions {
     /** Command runner injection point for tests or hosted agent sandboxes. */
     runner?: CircleCliRunner;
 }
+interface TypedDataRequest {
+    domain: Record<string, unknown>;
+    types: Record<string, unknown>;
+    primaryType: string;
+    message: Record<string, unknown>;
+}
 /**
  * Circle CLI / Agent Wallet payment engine. It creates the one-word x402
  * payment payload for Rubicon's session-first flow and delegates EIP-712
@@ -26,6 +48,27 @@ export declare class CircleCliGatewayPaymentEngine implements AgentPaymentEngine
     constructor(options?: CircleCliGatewayPaymentEngineOptions);
     createWordPayment(session: StartSessionResponse): Promise<StreamPaymentRequest>;
 }
+export declare class CircleCliGatewaySigner {
+    private readonly options;
+    agentWalletAddress: `0x${string}`;
+    address: `0x${string}`;
+    private resolved;
+    private resolving?;
+    constructor(options: {
+        agentWalletAddress?: `0x${string}`;
+        buyerWalletAddress?: `0x${string}`;
+        chain: string;
+        command: string;
+        runner: CircleCliRunner;
+    });
+    ensureAddress(): Promise<void>;
+    signTypedData(typed: TypedDataRequest): Promise<`0x${string}`>;
+    private resolveAddress;
+    private resolveAgentWalletAddress;
+    private resolveBackingEOA;
+}
 export declare function parseCircleCliSignature(output: string): `0x${string}`;
 export declare function parseCircleCliWalletAddress(output: string): `0x${string}`;
+export declare function parseCircleGatewayBackingEOA(output: string): `0x${string}`;
+export {};
 //# sourceMappingURL=circle-cli-gateway-payment.d.ts.map

package/dist/circle-cli-gateway-payment.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"circle-cli-gateway-payment.d.ts","sourceRoot":"","sources":["../src/circle-cli-gateway-payment.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAIvF,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAK9D,MAAM,MAAM,eAAe,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;AAEnF,MAAM,WAAW,oCAAoC;IACnD~~;;;OAGG~~;IACH,aAAa,CAAC,EAAE,KAAK,MAAM,EAAE,CAAC;IAC9B,kFAAkF;IAClF,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,sCAAsC;IACtC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,0EAA0E;IAC1E,MAAM,CAAC,EAAE,eAAe,CAAC;CAC1B;~~AASD~~;;;;;GAKG;AACH,qBAAa,6BAA8B,YAAW,kBAAkB;IACtE,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAoB;IACzC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAyB;gBAEpC,OAAO,GAAE,oCAAyC;~~IAaxD~~,iBAAiB,CAAC,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAAC,oBAAoB,CAAC;CAStF;~~AA4ED~~,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,MAAM,GAAG,KAAK,MAAM,EAAE,CAiBrE;AAED,wBAAgB,2BAA2B,CAAC,MAAM,EAAE,MAAM,GAAG,KAAK,MAAM,EAAE,CAezE"}
1	+ {"version":3,"file":"circle-cli-gateway-payment.d.ts","sourceRoot":"","sources":["../src/circle-cli-gateway-payment.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAIvF,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAK9D,MAAM,MAAM,eAAe,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;AAEnF,MAAM,WAAW,oCAAoC;IACnD;;;;;;;OAOG;IACH,aAAa,CAAC,EAAE,KAAK,MAAM,EAAE,CAAC;IAC9B;;;OAGG;IACH,kBAAkB,CAAC,EAAE,KAAK,MAAM,EAAE,CAAC;IACnC;;;OAGG;IACH,kBAAkB,CAAC,EAAE,KAAK,MAAM,EAAE,CAAC;IACnC,sCAAsC;IACtC,UAAU,CAAC,EAAE,KAAK,MAAM,EAAE,CAAC;IAC3B,kFAAkF;IAClF,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,sCAAsC;IACtC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,0EAA0E;IAC1E,MAAM,CAAC,EAAE,eAAe,CAAC;CAC1B;AAED,UAAU,gBAAgB;IACxB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAChC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC/B,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAClC;AAED;;;;;GAKG;AACH,qBAAa,6BAA8B,YAAW,kBAAkB;IACtE,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAoB;IACzC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAyB;gBAEpC,OAAO,GAAE,oCAAyC;IAcxD,iBAAiB,CAAC,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAAC,oBAAoB,CAAC;CAStF;AAED,qBAAa,sBAAsB;IAO/B,OAAO,CAAC,QAAQ,CAAC,OAAO;IAN1B,kBAAkB,EAAE,KAAK,MAAM,EAAE,CAAgD;IACjF,OAAO,EAAE,KAAK,MAAM,EAAE,CAAgD;IACtE,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,SAAS,CAAC,CAAgB;gBAGf,OAAO,EAAE;QACxB,kBAAkB,CAAC,EAAE,KAAK,MAAM,EAAE,CAAC;QACnC,kBAAkB,CAAC,EAAE,KAAK,MAAM,EAAE,CAAC;QACnC,KAAK,EAAE,MAAM,CAAC;QACd,OAAO,EAAE,MAAM,CAAC;QAChB,MAAM,EAAE,eAAe,CAAC;KACzB;IAaG,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;IAQ9B,aAAa,CAAC,KAAK,EAAE,gBAAgB,GAAG,OAAO,CAAC,KAAK,MAAM,EAAE,CAAC;YAgBtD,cAAc;YASd,yBAAyB;YAczB,iBAAiB;CAahC;AAgBD,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,MAAM,GAAG,KAAK,MAAM,EAAE,CAiBrE;AAED,wBAAgB,2BAA2B,CAAC,MAAM,EAAE,MAAM,GAAG,KAAK,MAAM,EAAE,CAezE;AAED,wBAAgB,4BAA4B,CAAC,MAAM,EAAE,MAAM,GAAG,KAAK,MAAM,EAAE,CAO1E"}

package/dist/circle-cli-gateway-payment.js CHANGED Viewed

@@ -16,7 +16,8 @@ export class CircleCliGatewayPaymentEngine {
     signer;
     constructor(options = {}) {
         this.signer = new CircleCliGatewaySigner({
-            walletAddress: options.walletAddress,
+            agentWalletAddress: options.agentWalletAddress ?? options.walletAddress,
+            buyerWalletAddress: options.buyerWalletAddress ?? options.backingEOA,
             chain: options.chain ?? "ARC-TESTNET",
             command: options.command ?? "circle",
             runner: options.runner ?? runCircleCli,
@@ -36,15 +37,21 @@ export class CircleCliGatewayPaymentEngine {
         };
     }
 }
-class CircleCliGatewaySigner {
+export class CircleCliGatewaySigner {
     options;
+    agentWalletAddress = "0x0000000000000000000000000000000000000000";
     address = "0x0000000000000000000000000000000000000000";
     resolved = false;
     resolving;
     constructor(options) {
         this.options = options;
-        if (options.walletAddress) {
-            this.address = options.walletAddress;
+        if (options.agentWalletAddress) {
+            this.agentWalletAddress = options.agentWalletAddress;
+        }
+        if (options.buyerWalletAddress) {
+            this.address = options.buyerWalletAddress;
+        }
+        if (options.agentWalletAddress && options.buyerWalletAddress) {
             this.resolved = true;
         }
     }
@@ -64,7 +71,7 @@ class CircleCliGatewaySigner {
             "typed-data",
             serializeTypedData(toEip712Payload(typed)),
             "--address",
-            this.address,
+            this.agentWalletAddress,
             "--chain",
             this.options.chain,
             "--quiet",
@@ -72,6 +79,13 @@ class CircleCliGatewaySigner {
         return parseCircleCliSignature(signature);
     }
     async resolveAddress() {
+        const agentWalletAddress = this.options.agentWalletAddress ?? (await this.resolveAgentWalletAddress());
+        this.agentWalletAddress = agentWalletAddress;
+        this.address =
+            this.options.buyerWalletAddress ?? (await this.resolveBackingEOA(agentWalletAddress));
+        this.resolved = true;
+    }
+    async resolveAgentWalletAddress() {
         const output = await this.options.runner(this.options.command, [
             "wallet",
             "list",
@@ -82,9 +96,20 @@ class CircleCliGatewaySigner {
             "--output",
             "json",
         ]);
-        const address = parseCircleCliWalletAddress(output);
-        this.address = address;
-        this.resolved = true;
+        return parseCircleCliWalletAddress(output);
+    }
+    async resolveBackingEOA(agentWalletAddress) {
+        const output = await this.options.runner(this.options.command, [
+            "gateway",
+            "balance",
+            "--address",
+            agentWalletAddress,
+            "--chain",
+            this.options.chain,
+            "--output",
+            "json",
+        ]);
+        return parseCircleGatewayBackingEOA(output);
     }
 }
 async function runCircleCli(command, args) {
@@ -130,7 +155,15 @@ export function parseCircleCliWalletAddress(output) {
     if (unique.length === 0) {
         throw new Error("Circle CLI did not return an Agent Wallet address");
     }
-    throw new Error("Multiple Circle Agent Wallets found; pass walletAddress explicitly");
+    throw new Error("Multiple Circle Agent Wallets found; pass agentWalletAddress explicitly");
+}
+export function parseCircleGatewayBackingEOA(output) {
+    const parsed = parseJson(output);
+    const backingEOA = findString(parsed, ["data.backingEOA", "backingEOA"]);
+    if (backingEOA && isAddress(backingEOA)) {
+        return backingEOA;
+    }
+    throw new Error("Circle Gateway balance did not return a backingEOA address");
 }
 function collectWalletCandidates(value) {
     if (Array.isArray(value)) {

package/dist/circle-cli-gateway-payment.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"circle-cli-gateway-payment.js","sourceRoot":"","sources":["../src/circle-cli-gateway-payment.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAEtC,OAAO,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AACvE,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAExD,OAAO,EAAE,kBAAkB,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAE/E,MAAM,aAAa,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC;~~AAyB1C~~;;;;;GAKG;AACH,MAAM,OAAO,6BAA6B;IACvB,IAAI,GAAG,IAAI,UAAU,EAAE,CAAC;IACxB,MAAM,CAAyB;IAEhD,YAAY,UAAgD,EAAE;QAC5D,IAAI,CAAC,MAAM,GAAG,IAAI,sBAAsB,CAAC;YACvC,~~aAAa~~,EAAE,OAAO,CAAC,aAAa;~~YACpC~~,KAAK,EAAE,OAAO,CAAC,KAAK,IAAI,aAAa;YACrC,OAAO,EAAE,OAAO,CAAC,OAAO,IAAI,QAAQ;YACpC,MAAM,EAAE,OAAO,CAAC,MAAM,IAAI,YAAY;SACvC,CAAC,CAAC;QACH,mBAAmB,CAAC,IAAI,CAAC,IAAI,EAAE;YAC7B,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,cAAc,EAAE,IAAI,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC;SAChD,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,OAA6B;QACnD,IAAI,CAAC,OAAO,CAAC,eAAe,EAAE,CAAC;YAC7B,MAAM,IAAI,KAAK,CAAC,8DAA8D,CAAC,CAAC;QAClF,CAAC;QACD,MAAM,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE,CAAC;QAClC,OAAO;YACL,cAAc,EAAE,MAAM,IAAI,CAAC,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC,eAAwB,CAAC;SACvF,CAAC;IACJ,CAAC;CACF;AAED,MAAM,sBAAsB;~~IAMP~~;~~IALnB~~,OAAO,GAAkB,4CAA4C,CAAC;IAC9D,QAAQ,GAAG,KAAK,CAAC;IACjB,SAAS,CAAiB;IAElC,YACmB,~~OAKhB~~;~~QALgB~~,YAAO,GAAP,OAAO,~~CAKvB~~;QAED,IAAI,OAAO,CAAC,~~aAAa~~,EAAE,CAAC;~~YAC1B~~,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,~~aAAa~~,CAAC;~~YACrC~~,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;QACvB,CAAC;IACH,CAAC;IAED,KAAK,CAAC,aAAa;QACjB,IAAI,IAAI,CAAC,QAAQ;YAAE,OAAO;QAC1B,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;YACpB,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QACzC,CAAC;QACD,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,KAAuB;QACzC,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;QAC3B,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE;YAChE,QAAQ;YACR,MAAM;YACN,YAAY;YACZ,kBAAkB,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;YAC1C,WAAW;YACX,IAAI,CAAC,~~OAAO~~;~~YACZ~~,SAAS;YACT,IAAI,CAAC,OAAO,CAAC,KAAK;YAClB,SAAS;SACV,CAAC,CAAC;QACH,OAAO,uBAAuB,CAAC,SAAS,CAAC,CAAC;IAC5C,CAAC;IAEO,KAAK,CAAC,cAAc;QAC1B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE;YAC7D,QAAQ;YACR,MAAM;YACN,SAAS;YACT,IAAI,CAAC,OAAO,CAAC,KAAK;YAClB,QAAQ;YACR,OAAO;YACP,UAAU;YACV,MAAM;SACP,CAAC,CAAC;QACH,~~MAAM,~~OAAO,~~GAAG,~~2BAA2B,CAAC,MAAM,CAAC,CAAC;~~QACpD~~,IAAI,CAAC,OAAO,~~GAAG~~,OAAO,CAAC;~~QACvB~~,IAAI,CAAC,~~QAAQ~~,~~GAAG~~,~~IAAI~~,CAAC;~~IACvB~~,CAAC;CACF;AAED,KAAK,UAAU,YAAY,CAAC,OAAe,EAAE,IAAc;IACzD,IAAI,CAAC;QACH,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,aAAa,CAAC,OAAO,EAAE,IAAI,EAAE;YACpD,SAAS,EAAE,IAAI,GAAG,IAAI;SACvB,CAAC,CAAC;QACH,OAAO,MAAM,CAAC;IAChB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACvE,MAAM,IAAI,KAAK,CACb,wHAAwH,OAAO,EAAE,CAClI,CAAC;IACJ,CAAC;AACH,CAAC;AAED,MAAM,UAAU,uBAAuB,CAAC,MAAc;IACpD,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,EAAE,CAAC;IAC9B,IAAI,cAAc,CAAC,OAAO,CAAC,EAAE,CAAC;QAC5B,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,IAAI,MAAe,CAAC;IACpB,IAAI,CAAC;QACH,MAAM,GAAG,SAAS,CAAC,OAAO,CAAC,CAAC;IAC9B,CAAC;IAAC,MAAM,CAAC;QACP,MAAM,IAAI,KAAK,CAAC,mDAAmD,CAAC,CAAC;IACvE,CAAC;IACD,MAAM,SAAS,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,WAAW,EAAE,YAAY,EAAE,gBAAgB,CAAC,CAAC,CAAC;IACpF,IAAI,SAAS,IAAI,cAAc,CAAC,SAAS,CAAC,EAAE,CAAC;QAC3C,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,MAAM,IAAI,KAAK,CAAC,mDAAmD,CAAC,CAAC;AACvE,CAAC;AAED,MAAM,UAAU,2BAA2B,CAAC,MAAc;IACxD,MAAM,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC;IACjC,MAAM,OAAO,GAAG,uBAAuB,CAAC,MAAM,CAAC,CAAC;IAChD,MAAM,SAAS,GAAG,OAAO;SACtB,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,SAAS,EAAE,eAAe,EAAE,mBAAmB,CAAC,CAAC,CAAC;SACtF,MAAM,CAAC,CAAC,OAAO,EAA4B,EAAE,CAAC,OAAO,CAAC,OAAO,IAAI,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IAEzF,MAAM,MAAM,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,CAAC;IAC/E,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACxB,OAAO,SAAS,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,WAAW,EAAE,KAAK,MAAM,CAAC,CAAC,CAAC,CAAE,CAAC;IAC3E,CAAC;IACD,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACxB,MAAM,IAAI,KAAK,CAAC,mDAAmD,CAAC,CAAC;IACvE,CAAC;IACD,MAAM,IAAI,KAAK,CAAC,~~oEAAoE~~,CAAC,CAAC;~~AACxF~~,CAAC;AAED,SAAS,uBAAuB,CAAC,KAAc;IAC7C,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QACzB,OAAO,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAChC,CAAC;IACD,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;QACrB,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,KAAK,MAAM,GAAG,IAAI,CAAC,SAAS,EAAE,OAAO,EAAE,MAAM,CAAC,EAAE,CAAC;QAC/C,MAAM,MAAM,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC;QAC1B,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;YAC1B,OAAO,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QACjC,CAAC;QACD,IAAI,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;YACrB,MAAM,MAAM,GAAG,uBAAuB,CAAC,MAAM,CAAC,CAAC;YAC/C,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC;gBAAE,OAAO,MAAM,CAAC;QACvC,CAAC;IACH,CAAC;IACD,OAAO,CAAC,KAAK,CAAC,CAAC;AACjB,CAAC;AAED,SAAS,UAAU,CAAC,KAAc,EAAE,IAAc;IAChD,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAU,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE;YAC7D,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC;gBAAE,OAAO,SAAS,CAAC;YACzC,OAAO,OAAO,CAAC,IAAI,CAAC,CAAC;QACvB,CAAC,EAAE,KAAK,CAAC,CAAC;QACV,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YAC9B,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,SAAS,SAAS,CAAC,KAAa;IAC9B,IAAI,CAAC;QACH,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IAC3B,CAAC;IAAC,MAAM,CAAC;QACP,MAAM,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAC;IACzD,CAAC;AACH,CAAC;AAED,SAAS,cAAc,CAAC,KAAa;IACnC,OAAO,kBAAkB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;AACxC,CAAC;AAED,SAAS,SAAS,CAAC,KAAa;IAC9B,OAAO,qBAAqB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;AAC3C,CAAC;AAED,SAAS,QAAQ,CAAC,KAAc;IAC9B,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,CAAC;AACrD,CAAC"}
1	+ {"version":3,"file":"circle-cli-gateway-payment.js","sourceRoot":"","sources":["../src/circle-cli-gateway-payment.ts"],"names":[],"mappings":"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"}

package/dist/circle-cli-gateway-payment.test.js CHANGED Viewed

@@ -1,6 +1,6 @@
 import { test } from "node:test";
 import assert from "node:assert/strict";
-import { parseCircleCliSignature, parseCircleCliWalletAddress, } from "./circle-cli-gateway-payment.js";
+import { CircleCliGatewaySigner, parseCircleGatewayBackingEOA, parseCircleCliSignature, parseCircleCliWalletAddress, } from "./circle-cli-gateway-payment.js";
 test("parses quiet Circle CLI signatures", () => {
     assert.equal(parseCircleCliSignature("0xabc123\n"), "0xabc123");
 });
@@ -21,6 +21,115 @@ test("parses a sole wallet address from Circle CLI list output", () => {
         },
     })), "0x1111111111111111111111111111111111111111");
 });
+test("parses backing EOA from Circle Gateway balance output", () => {
+    assert.equal(parseCircleGatewayBackingEOA(JSON.stringify({
+        data: {
+            backingEOA: "0x2222222222222222222222222222222222222222",
+        },
+    })), "0x2222222222222222222222222222222222222222");
+});
+test("separates Circle CLI Agent Wallet address from x402 backing EOA", async () => {
+    const calls = [];
+    const signer = new CircleCliGatewaySigner({
+        agentWalletAddress: "0x1111111111111111111111111111111111111111",
+        chain: "ARC-TESTNET",
+        command: "circle",
+        runner: async (_command, args) => {
+            calls.push(args);
+            assert.deepEqual(args, [
+                "gateway",
+                "balance",
+                "--address",
+                "0x1111111111111111111111111111111111111111",
+                "--chain",
+                "ARC-TESTNET",
+                "--output",
+                "json",
+            ]);
+            return JSON.stringify({
+                data: {
+                    backingEOA: "0x2222222222222222222222222222222222222222",
+                },
+            });
+        },
+    });
+    await signer.ensureAddress();
+    assert.equal(signer.agentWalletAddress, "0x1111111111111111111111111111111111111111");
+    assert.equal(signer.address, "0x2222222222222222222222222222222222222222");
+    assert.equal(calls.length, 1);
+});
+test("discovers sole Agent Wallet and then its Gateway backing EOA", async () => {
+    const calls = [];
+    const signer = new CircleCliGatewaySigner({
+        chain: "ARC-TESTNET",
+        command: "circle",
+        runner: async (_command, args) => {
+            calls.push(args);
+            if (args[0] === "wallet") {
+                return JSON.stringify({
+                    data: {
+                        wallets: [{ address: "0x1111111111111111111111111111111111111111" }],
+                    },
+                });
+            }
+            return JSON.stringify({
+                data: {
+                    backingEOA: "0x2222222222222222222222222222222222222222",
+                },
+            });
+        },
+    });
+    await signer.ensureAddress();
+    assert.equal(signer.agentWalletAddress, "0x1111111111111111111111111111111111111111");
+    assert.equal(signer.address, "0x2222222222222222222222222222222222222222");
+    assert.deepEqual(calls, [
+        ["wallet", "list", "--chain", "ARC-TESTNET", "--type", "agent", "--output", "json"],
+        [
+            "gateway",
+            "balance",
+            "--address",
+            "0x1111111111111111111111111111111111111111",
+            "--chain",
+            "ARC-TESTNET",
+            "--output",
+            "json",
+        ],
+    ]);
+});
+test("typed data message.from uses backing EOA while CLI signs with Agent Wallet", async () => {
+    let signedPayload;
+    const signer = new CircleCliGatewaySigner({
+        agentWalletAddress: "0x1111111111111111111111111111111111111111",
+        buyerWalletAddress: "0x2222222222222222222222222222222222222222",
+        chain: "ARC-TESTNET",
+        command: "circle",
+        runner: async (_command, args) => {
+            const addressFlag = args.indexOf("--address");
+            assert.equal(args[addressFlag + 1], "0x1111111111111111111111111111111111111111");
+            signedPayload = JSON.parse(args[3] ?? "{}");
+            return "0xabc123";
+        },
+    });
+    await signer.ensureAddress();
+    assert.equal(signer.address, "0x2222222222222222222222222222222222222222");
+    await signer.signTypedData({
+        domain: { name: "USD Coin", version: "2", chainId: 5042002 },
+        types: {
+            TransferWithAuthorization: [
+                { name: "from", type: "address" },
+                { name: "to", type: "address" },
+                { name: "value", type: "uint256" },
+            ],
+        },
+        primaryType: "TransferWithAuthorization",
+        message: {
+            from: signer.address,
+            to: "0x3333333333333333333333333333333333333333",
+            value: 1n,
+        },
+    });
+    assert.equal((signedPayload?.message).from, "0x2222222222222222222222222222222222222222");
+});
 test("requires explicit wallet address when multiple Agent Wallets are present", () => {
     assert.throws(() => parseCircleCliWalletAddress(JSON.stringify({
         data: [

package/dist/circle-cli-gateway-payment.test.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"circle-cli-gateway-payment.test.js","sourceRoot":"","sources":["../src/circle-cli-gateway-payment.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,MAAM,MAAM,oBAAoB,CAAC;AACxC,OAAO,EACL,uBAAuB,EACvB,2BAA2B,GAC5B,MAAM,iCAAiC,CAAC;AAEzC,IAAI,CAAC,oCAAoC,EAAE,GAAG,EAAE;IAC9C,MAAM,CAAC,KAAK,CAAC,uBAAuB,CAAC,YAAY,CAAC,EAAE,UAAU,CAAC,CAAC;AAClE,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,mCAAmC,EAAE,GAAG,EAAE;IAC7C,MAAM,CAAC,KAAK,CACV,uBAAuB,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,EAAE,SAAS,EAAE,UAAU,EAAE,EAAE,CAAC,CAAC,EAC5E,UAAU,CACX,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,yCAAyC,EAAE,GAAG,EAAE;IACnD,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,uBAAuB,CAAC,QAAQ,CAAC,EAAE,wCAAwC,CAAC,CAAC;AACnG,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,0DAA0D,EAAE,GAAG,EAAE;IACpE,MAAM,CAAC,KAAK,CACV,2BAA2B,CACzB,IAAI,CAAC,SAAS,CAAC;QACb,IAAI,EAAE;YACJ,OAAO,EAAE;gBACP;oBACE,OAAO,EAAE,4CAA4C;iBACtD;aACF;SACF;KACF,CAAC,CACH,EACD,4CAA4C,CAC7C,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,0EAA0E,EAAE,GAAG,EAAE;IACpF,MAAM,CAAC,MAAM,CACX,GAAG,EAAE,CACH,2BAA2B,CACzB,IAAI,CAAC,SAAS,CAAC;QACb,IAAI,EAAE;YACJ,EAAE,OAAO,EAAE,4CAA4C,EAAE;YACzD,EAAE,OAAO,EAAE,4CAA4C,EAAE;SAC1D;KACF,CAAC,CACH,EACH,qCAAqC,CACtC,CAAC;AACJ,CAAC,CAAC,CAAC"}
1	+ {"version":3,"file":"circle-cli-gateway-payment.test.js","sourceRoot":"","sources":["../src/circle-cli-gateway-payment.test.ts"],"names":[],"mappings":"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"}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@rubicon-caliga/agent-sdk",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "Client SDK for autonomous agents consuming per-word article streams via Rubicon x402.",
   "license": "MIT",
   "type": "module",

package/src/agent-client.test.ts ADDED Viewed

@@ -0,0 +1,118 @@
+import { test } from "node:test";
+import assert from "node:assert/strict";
+import { RubiconClient } from "./agent-client.js";
+import type { AgentPaymentEngine } from "./payment-engine.js";
+const paymentEngine: AgentPaymentEngine = {
+  async createWordPayment() {
+    return { paymentPayload: { ok: true } };
+  },
+};
+test("run receipt preserves Gateway settlement receipt fields", async () => {
+  const fetcher = (async (input: Parameters<typeof fetch>[0]) => {
+    const url = String(input);
+    if (url.endsWith("/v1/sessions")) {
+      return jsonResponse({
+        sessionId: "session_1",
+        state: "active",
+        article: article(),
+        navigation: navigation(),
+        pricePerWordAtomic: "1",
+        maxArticlePriceAtomic: "10",
+        conversationId: "conversation_1",
+        wordPaymentAtomic: "1",
+        gatewayFeeBps: 0,
+        paymentRequired: { scheme: "exact" },
+        expiresAt: "2026-06-18T12:00:00.000Z",
+        wordsPaid: 0,
+        wordsDelivered: 0,
+        paidAtomic: "0",
+      });
+    }
+    if (url.endsWith("/v1/sessions/session_1/payments")) {
+      return jsonResponse({
+        accepted: true,
+        sequence: 0,
+        word: "Rubicon",
+        priceAtomic: "1",
+        wordsPaid: 1,
+        wordsDelivered: 1,
+        paidAtomic: "1",
+        completed: true,
+        transactionHashes: [],
+        settlementIds: ["settlement_1"],
+        payment: {
+          paymentId: "payment_1",
+          sessionId: "session_1",
+          articleId: "article_1",
+          sequence: 0,
+          meteringUnit: "word",
+          amountAtomic: "1",
+          currency: "USDC",
+          network: "eip155:5042002",
+          payTo: "0x3333333333333333333333333333333333333333",
+          transactionHashes: [],
+          settlementIds: ["settlement_1"],
+          buyerWalletAddress: "0x2222222222222222222222222222222222222222",
+          settledAt: "2026-06-18T12:00:00.000Z",
+        },
+      });
+    }
+    throw new Error(`Unexpected fetch: ${url}`);
+  }) as typeof fetch;
+  const client = new RubiconClient({
+    baseUrl: "http://rubicon.test",
+    paymentEngine,
+    fetch: fetcher,
+  });
+  const receipt = await client.run({
+    articleId: "article_1",
+    maxSpendAtomic: "10",
+  });
+  assert.deepEqual(receipt.transactionHashes, []);
+  assert.deepEqual(receipt.settlementIds, ["settlement_1"]);
+  assert.equal(receipt.buyerWalletAddress, "0x2222222222222222222222222222222222222222");
+  assert.equal(receipt.sellerPayTo, "0x3333333333333333333333333333333333333333");
+  assert.equal(receipt.network, "eip155:5042002");
+});
+function jsonResponse(body: unknown): Response {
+  return new Response(JSON.stringify(body), {
+    status: 200,
+    headers: { "content-type": "application/json" },
+  });
+}
+function article() {
+  return {
+    articleId: "article_1",
+    creatorId: "creator_1",
+    creatorUsername: "creator",
+    title: "Title",
+    author: "Author",
+    state: "published",
+    totalWords: 1,
+    pricePerWordAtomic: "1",
+    maxArticlePriceAtomic: "1",
+    sections: [],
+  };
+}
+function navigation() {
+  return {
+    articleId: "article_1",
+    sections: [],
+    sellerAgent: {
+      recommendedSectionId: "intro",
+      alternativeSectionIds: [],
+      rationale: "",
+      safeHints: [],
+      withheld: [],
+    },
+    stopConditions: [],
+  };
+}

package/src/circle-cli-gateway-payment.test.ts CHANGED Viewed

@@ -1,6 +1,8 @@
 import { test } from "node:test";
 import assert from "node:assert/strict";
 import {
+  CircleCliGatewaySigner,
+  parseCircleGatewayBackingEOA,
   parseCircleCliSignature,
   parseCircleCliWalletAddress,
 } from "./circle-cli-gateway-payment.js";
@@ -37,6 +39,133 @@ test("parses a sole wallet address from Circle CLI list output", () => {
   );
 });
+test("parses backing EOA from Circle Gateway balance output", () => {
+  assert.equal(
+    parseCircleGatewayBackingEOA(
+      JSON.stringify({
+        data: {
+          backingEOA: "0x2222222222222222222222222222222222222222",
+        },
+      }),
+    ),
+    "0x2222222222222222222222222222222222222222",
+  );
+});
+test("separates Circle CLI Agent Wallet address from x402 backing EOA", async () => {
+  const calls: string[][] = [];
+  const signer = new CircleCliGatewaySigner({
+    agentWalletAddress: "0x1111111111111111111111111111111111111111",
+    chain: "ARC-TESTNET",
+    command: "circle",
+    runner: async (_command, args) => {
+      calls.push(args);
+      assert.deepEqual(args, [
+        "gateway",
+        "balance",
+        "--address",
+        "0x1111111111111111111111111111111111111111",
+        "--chain",
+        "ARC-TESTNET",
+        "--output",
+        "json",
+      ]);
+      return JSON.stringify({
+        data: {
+          backingEOA: "0x2222222222222222222222222222222222222222",
+        },
+      });
+    },
+  });
+  await signer.ensureAddress();
+  assert.equal(signer.agentWalletAddress, "0x1111111111111111111111111111111111111111");
+  assert.equal(signer.address, "0x2222222222222222222222222222222222222222");
+  assert.equal(calls.length, 1);
+});
+test("discovers sole Agent Wallet and then its Gateway backing EOA", async () => {
+  const calls: string[][] = [];
+  const signer = new CircleCliGatewaySigner({
+    chain: "ARC-TESTNET",
+    command: "circle",
+    runner: async (_command, args) => {
+      calls.push(args);
+      if (args[0] === "wallet") {
+        return JSON.stringify({
+          data: {
+            wallets: [{ address: "0x1111111111111111111111111111111111111111" }],
+          },
+        });
+      }
+      return JSON.stringify({
+        data: {
+          backingEOA: "0x2222222222222222222222222222222222222222",
+        },
+      });
+    },
+  });
+  await signer.ensureAddress();
+  assert.equal(signer.agentWalletAddress, "0x1111111111111111111111111111111111111111");
+  assert.equal(signer.address, "0x2222222222222222222222222222222222222222");
+  assert.deepEqual(calls, [
+    ["wallet", "list", "--chain", "ARC-TESTNET", "--type", "agent", "--output", "json"],
+    [
+      "gateway",
+      "balance",
+      "--address",
+      "0x1111111111111111111111111111111111111111",
+      "--chain",
+      "ARC-TESTNET",
+      "--output",
+      "json",
+    ],
+  ]);
+});
+test("typed data message.from uses backing EOA while CLI signs with Agent Wallet", async () => {
+  let signedPayload: Record<string, unknown> | undefined;
+  const signer = new CircleCliGatewaySigner({
+    agentWalletAddress: "0x1111111111111111111111111111111111111111",
+    buyerWalletAddress: "0x2222222222222222222222222222222222222222",
+    chain: "ARC-TESTNET",
+    command: "circle",
+    runner: async (_command, args) => {
+      const addressFlag = args.indexOf("--address");
+      assert.equal(args[addressFlag + 1], "0x1111111111111111111111111111111111111111");
+      signedPayload = JSON.parse(args[3] ?? "{}") as Record<string, unknown>;
+      return "0xabc123";
+    },
+  });
+  await signer.ensureAddress();
+  assert.equal(signer.address, "0x2222222222222222222222222222222222222222");
+  await signer.signTypedData({
+    domain: { name: "USD Coin", version: "2", chainId: 5042002 },
+    types: {
+      TransferWithAuthorization: [
+        { name: "from", type: "address" },
+        { name: "to", type: "address" },
+        { name: "value", type: "uint256" },
+      ],
+    },
+    primaryType: "TransferWithAuthorization",
+    message: {
+      from: signer.address,
+      to: "0x3333333333333333333333333333333333333333",
+      value: 1n,
+    },
+  });
+  assert.equal(
+    (signedPayload?.message as Record<string, unknown>).from,
+    "0x2222222222222222222222222222222222222222",
+  );
+});
 test("requires explicit wallet address when multiple Agent Wallets are present", () => {
   assert.throws(
     () =>

package/src/circle-cli-gateway-payment.ts CHANGED Viewed

@@ -15,8 +15,24 @@ export interface CircleCliGatewayPaymentEngineOptions {
   /**
    * Agent Wallet address controlled by Circle CLI. When omitted, the engine
    * resolves the sole agent wallet returned by `circle wallet list`.
+   *
+   * @deprecated Use `agentWalletAddress`. This alias is kept for existing SDK
+   * callers and is treated as the Circle CLI signing wallet, not the x402
+   * authorization `from` address.
    */
   walletAddress?: `0x${string}`;
+  /**
+   * Agent Wallet address controlled by Circle CLI. This is passed to
+   * `circle wallet sign typed-data --address`.
+   */
+  agentWalletAddress?: `0x${string}`;
+  /**
+   * Gateway backing EOA used as the x402 authorization `from` address. When
+   * omitted, the engine resolves it from `circle gateway balance`.
+   */
+  buyerWalletAddress?: `0x${string}`;
+  /** Alias for `buyerWalletAddress`. */
+  backingEOA?: `0x${string}`;
   /** Circle CLI chain name. Rubicon real reads settle on Arc Testnet by default. */
   chain?: string;
   /** Circle CLI binary name or path. */
@@ -44,7 +60,8 @@ export class CircleCliGatewayPaymentEngine implements AgentPaymentEngine {
   constructor(options: CircleCliGatewayPaymentEngineOptions = {}) {
     this.signer = new CircleCliGatewaySigner({
-      walletAddress: options.walletAddress,
+      agentWalletAddress: options.agentWalletAddress ?? options.walletAddress,
+      buyerWalletAddress: options.buyerWalletAddress ?? options.backingEOA,
       chain: options.chain ?? "ARC-TESTNET",
       command: options.command ?? "circle",
       runner: options.runner ?? runCircleCli,
@@ -66,21 +83,28 @@ export class CircleCliGatewayPaymentEngine implements AgentPaymentEngine {
   }
 }
-class CircleCliGatewaySigner {
+export class CircleCliGatewaySigner {
+  agentWalletAddress: `0x${string}` = "0x0000000000000000000000000000000000000000";
   address: `0x${string}` = "0x0000000000000000000000000000000000000000";
   private resolved = false;
   private resolving?: Promise<void>;
   constructor(
     private readonly options: {
-      walletAddress?: `0x${string}`;
+      agentWalletAddress?: `0x${string}`;
+      buyerWalletAddress?: `0x${string}`;
       chain: string;
       command: string;
       runner: CircleCliRunner;
     },
   ) {
-    if (options.walletAddress) {
-      this.address = options.walletAddress;
+    if (options.agentWalletAddress) {
+      this.agentWalletAddress = options.agentWalletAddress;
+    }
+    if (options.buyerWalletAddress) {
+      this.address = options.buyerWalletAddress;
+    }
+    if (options.agentWalletAddress && options.buyerWalletAddress) {
       this.resolved = true;
     }
   }
@@ -101,7 +125,7 @@ class CircleCliGatewaySigner {
       "typed-data",
       serializeTypedData(toEip712Payload(typed)),
       "--address",
-      this.address,
+      this.agentWalletAddress,
       "--chain",
       this.options.chain,
       "--quiet",
@@ -110,6 +134,15 @@ class CircleCliGatewaySigner {
   }
   private async resolveAddress(): Promise<void> {
+    const agentWalletAddress =
+      this.options.agentWalletAddress ?? (await this.resolveAgentWalletAddress());
+    this.agentWalletAddress = agentWalletAddress;
+    this.address =
+      this.options.buyerWalletAddress ?? (await this.resolveBackingEOA(agentWalletAddress));
+    this.resolved = true;
+  }
+  private async resolveAgentWalletAddress(): Promise<`0x${string}`> {
     const output = await this.options.runner(this.options.command, [
       "wallet",
       "list",
@@ -120,9 +153,21 @@ class CircleCliGatewaySigner {
       "--output",
       "json",
     ]);
-    const address = parseCircleCliWalletAddress(output);
-    this.address = address;
-    this.resolved = true;
+    return parseCircleCliWalletAddress(output);
+  }
+  private async resolveBackingEOA(agentWalletAddress: `0x${string}`): Promise<`0x${string}`> {
+    const output = await this.options.runner(this.options.command, [
+      "gateway",
+      "balance",
+      "--address",
+      agentWalletAddress,
+      "--chain",
+      this.options.chain,
+      "--output",
+      "json",
+    ]);
+    return parseCircleGatewayBackingEOA(output);
   }
 }
@@ -173,7 +218,16 @@ export function parseCircleCliWalletAddress(output: string): `0x${string}` {
   if (unique.length === 0) {
     throw new Error("Circle CLI did not return an Agent Wallet address");
   }
-  throw new Error("Multiple Circle Agent Wallets found; pass walletAddress explicitly");
+  throw new Error("Multiple Circle Agent Wallets found; pass agentWalletAddress explicitly");
+}
+export function parseCircleGatewayBackingEOA(output: string): `0x${string}` {
+  const parsed = parseJson(output);
+  const backingEOA = findString(parsed, ["data.backingEOA", "backingEOA"]);
+  if (backingEOA && isAddress(backingEOA)) {
+    return backingEOA;
+  }
+  throw new Error("Circle Gateway balance did not return a backingEOA address");
 }
 function collectWalletCandidates(value: unknown): Record<string, unknown>[] {