@aomi-labs/client 0.1.18 → 0.1.20

package/dist/cli.js

@@ -22,7 +22,7 @@ var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 // package.json
 var package_default = {
   name: "@aomi-labs/client",
-  version: "0.1.18",
+  version: "0.1.19",
   description: "Platform-agnostic TypeScript client for the Aomi backend API",
   type: "module",
   main: "./dist/index.cjs",
@@ -53,9 +53,10 @@ var package_default = {
     "clean:dist": "rm -rf dist"
   },
   dependencies: {
-    "@getpara/aa-alchemy": "2.18.0",
-    "@getpara/aa-pimlico": "2.18.0",
-    viem: "^2.40.3"
+    "@alchemy/wallet-apis": "5.0.0-beta.22",
+    "@getpara/aa-alchemy": "2.21.0",
+    "@getpara/aa-pimlico": "2.21.0",
+    viem: "^2.47.11"
   }
 };
 
@@ -499,6 +500,12 @@ function getNextTxId(state) {
 }
 function addPendingTx(state, tx) {
   if (!state.pendingTxs) state.pendingTxs = [];
+  const isDuplicate = state.pendingTxs.some(
+    (existing) => existing.kind === tx.kind && existing.to === tx.to && existing.data === tx.data && existing.value === tx.value && existing.chainId === tx.chainId
+  );
+  if (isDuplicate) {
+    return null;
+  }
   const pending = __spreadProps(__spreadValues({}, tx), {
     id: getNextTxId(state)
   });
@@ -1161,10 +1168,11 @@ var AomiClient = class {
   // Batch Simulation
   // ===========================================================================
   /**
-   * Simulate pending transactions as an atomic batch.
+   * Simulate transactions as an atomic batch.
    * Each tx sees state changes from previous txs (e.g., approve → swap).
+   * Sends full tx payloads — the backend does not look up by ID.
    */
-  async simulateBatch(sessionId, txIds) {
+  async simulateBatch(sessionId, transactions, options) {
     const url = joinApiPath(this.baseUrl, "/api/simulate");
     const headers = new Headers(
       withSessionHeader(sessionId, { "Content-Type": "application/json" })
@@ -1172,13 +1180,20 @@ var AomiClient = class {
     if (this.apiKey) {
       headers.set(API_KEY_HEADER, this.apiKey);
     }
+    const payload = {
+      transactions,
+      from: options == null ? void 0 : options.from,
+      chain_id: options == null ? void 0 : options.chainId
+    };
     const response = await fetch(url, {
       method: "POST",
       headers,
-      body: JSON.stringify({ tx_ids: txIds })
+      body: JSON.stringify(payload)
     });
     if (!response.ok) {
-      throw new Error(`HTTP ${response.status}: ${response.statusText}`);
+      const body = await response.text().catch(() => "");
+      throw new Error(`HTTP ${response.status}: ${response.statusText}${body ? `
+${body}` : ""}`);
     }
     return await response.json();
   }
@@ -1443,6 +1458,7 @@ var ClientSession = class extends TypedEventEmitter {
     this.pollTimer = null;
     this.unsubscribeSSE = null;
     this._isProcessing = false;
+    this._backendWasProcessing = false;
     this.walletRequests = [];
     this.walletRequestNextId = 1;
     this._messages = [];
@@ -1673,6 +1689,7 @@ var ClientSession = class extends TypedEventEmitter {
   startPolling() {
     var _a3;
     if (this.pollTimer || this.closed) return;
+    this._backendWasProcessing = true;
     (_a3 = this.logger) == null ? void 0 : _a3.debug("[session] polling started", this.sessionId);
     this.pollTimer = setInterval(() => {
       void this.pollTick();
@@ -1698,6 +1715,10 @@ var ClientSession = class extends TypedEventEmitter {
       if (!this.pollTimer) return;
       this.assertUserStateAligned(state.user_state);
       this.applyState(state);
+      if (this._backendWasProcessing && !state.is_processing) {
+        this.emit("backend_idle", void 0);
+      }
+      this._backendWasProcessing = !!state.is_processing;
       if (!state.is_processing && this.walletRequests.length === 0) {
         this.stopPolling();
         this._isProcessing = false;
@@ -2093,11 +2114,7 @@ async function chatCommand(runtime) {
     }
     if (session.getIsProcessing()) {
       await new Promise((resolve) => {
-        const checkWallet = () => {
-          if (capturedRequests.length > 0) resolve();
-        };
-        session.on("wallet_tx_request", checkWallet);
-        session.on("wallet_eip712_request", checkWallet);
+        session.on("backend_idle", () => resolve());
         session.on("processing_end", () => resolve());
       });
     }
@@ -2133,6 +2150,10 @@ async function chatCommand(runtime) {
     }
     for (const request of capturedRequests) {
       const pending = addPendingTx(state, walletRequestToPendingTx(request));
+      if (!pending) {
+        console.log("\u26A0\uFE0F  Duplicate wallet request skipped");
+        continue;
+      }
       console.log(`\u26A1 Wallet request queued: ${pending.id}`);
       if (request.kind === "transaction") {
         const payload = request.payload;
@@ -2305,6 +2326,10 @@ async function executeViaAA(callList, providerState) {
   const receipt = callList.length > 1 ? await AA.sendBatchTransaction(callsPayload) : await AA.sendTransaction(callsPayload[0]);
   const txHash = receipt.transactionHash;
   const providerPrefix = AA.provider.toLowerCase();
+  let delegationAddress = AA.mode === "7702" ? AA.delegationAddress : void 0;
+  if (AA.mode === "7702" && !delegationAddress) {
+    delegationAddress = await resolve7702Delegation(txHash, callList);
+  }
   return {
     txHash,
     txHashes: [txHash],
@@ -2312,9 +2337,36 @@ async function executeViaAA(callList, providerState) {
     batched: callList.length > 1,
     sponsored: plan.sponsorship !== "disabled",
     AAAddress: AA.AAAddress,
-    delegationAddress: AA.mode === "7702" ? AA.delegationAddress : void 0
+    delegationAddress
   };
 }
+async function resolve7702Delegation(txHash, callList) {
+  var _a3, _b, _c, _d;
+  try {
+    const { createPublicClient, http: http2 } = await import("viem");
+    const chainId = (_a3 = callList[0]) == null ? void 0 : _a3.chainId;
+    if (!chainId) return void 0;
+    const { mainnet, polygon, arbitrum, optimism, base } = await import("viem/chains");
+    const knownChains = {
+      1: mainnet,
+      137: polygon,
+      42161: arbitrum,
+      10: optimism,
+      8453: base
+    };
+    const chain = knownChains[chainId];
+    if (!chain) return void 0;
+    const client = createPublicClient({ chain, transport: http2() });
+    const tx = await client.getTransaction({ hash: txHash });
+    const authList = tx.authorizationList;
+    const target = (_d = (_b = authList == null ? void 0 : authList[0]) == null ? void 0 : _b.address) != null ? _d : (_c = authList == null ? void 0 : authList[0]) == null ? void 0 : _c.contractAddress;
+    if (target) {
+      return target;
+    }
+  } catch (e) {
+  }
+  return void 0;
+}
 async function executeViaEoa({
   callList,
   currentChainId,
@@ -2978,7 +3030,7 @@ Run \`aomi tx\` to see available IDs.`
   return pendingTx;
 }
 async function simulateCommand(runtime) {
-  var _a3;
+  var _a3, _b, _c;
   const state = readState();
   if (!state) {
     fatal("No active session. Run `aomi chat` first.");
@@ -2987,9 +3039,7 @@ async function simulateCommand(runtime) {
   if (txIds.length === 0) {
     fatal("Usage: aomi simulate <tx-id> [<tx-id> ...]\nRun `aomi tx` to see available IDs.");
   }
-  for (const txId of txIds) {
-    requirePendingTx(state, txId);
-  }
+  const pendingTxs = txIds.map((txId) => requirePendingTx(state, txId));
   console.log(
     `${DIM}Simulating ${txIds.length} transaction(s) as atomic batch...${RESET}`
   );
@@ -2997,7 +3047,23 @@ async function simulateCommand(runtime) {
     baseUrl: state.baseUrl,
     apiKey: state.apiKey
   });
-  const response = await client.simulateBatch(state.sessionId, txIds);
+  const transactions = pendingTxs.map((tx) => {
+    var _a4;
+    return {
+      to: tx.to,
+      value: tx.value,
+      data: tx.data,
+      label: (_a4 = tx.description) != null ? _a4 : tx.id
+    };
+  });
+  const response = await client.simulateBatch(
+    state.sessionId,
+    transactions,
+    {
+      from: (_a3 = state.publicKey) != null ? _a3 : void 0,
+      chainId: (_b = state.chainId) != null ? _b : void 0
+    }
+  );
   const { result } = response;
   const modeLabel = result.stateful ? "stateful (Anvil snapshot)" : "stateless (independent eth_call)";
   console.log(`
@@ -3032,7 +3098,7 @@ ${DIM}Total gas: ${result.total_gas.toLocaleString()}${RESET}`);
   } else {
     const failed = result.steps.find((s) => !s.success);
     console.log(
-      `\x1B[31mBatch failed at step ${(_a3 = failed == null ? void 0 : failed.step) != null ? _a3 : "?"}.${RESET} Fix the issue and re-queue, or run \`aomi sign\` on the successful prefix.`
+      `\x1B[31mBatch failed at step ${(_c = failed == null ? void 0 : failed.step) != null ? _c : "?"}.${RESET} Fix the issue and re-queue, or run \`aomi sign\` on the successful prefix.`
     );
   }
 }
@@ -3229,11 +3295,12 @@ function resolvePimlicoConfig(options) {
 
 // src/aa/adapt.ts
 function adaptSmartAccount(account) {
+  const delegationAddress = account.mode === "7702" && account.delegationAddress && account.smartAccountAddress && account.delegationAddress.toLowerCase() === account.smartAccountAddress.toLowerCase() ? void 0 : account.delegationAddress;
   return {
     provider: account.provider,
     mode: account.mode,
     AAAddress: account.smartAccountAddress,
-    delegationAddress: account.delegationAddress,
+    delegationAddress,
     sendTransaction: async (call) => {
       const receipt = await account.sendTransaction(call);
       return { transactionHash: receipt.transactionHash };
@@ -3374,6 +3441,25 @@ async function createAlchemyAAState(options) {
   if (ownerParams.kind === "unsupported_adapter") {
     return getUnsupportedAdapterState(plan, ownerParams.adapter);
   }
+  if (owner.kind === "direct") {
+    try {
+      return await createAlchemyWalletApisState({
+        plan,
+        chain,
+        privateKey: owner.privateKey,
+        apiKey,
+        gasPolicyId,
+        mode: plan.mode
+      });
+    } catch (error) {
+      return {
+        plan,
+        AA: null,
+        isPending: false,
+        error: error instanceof Error ? error : new Error(String(error))
+      };
+    }
+  }
   try {
     const smartAccount = await createAlchemySmartAccount(__spreadProps(__spreadValues({}, ownerParams.ownerParams), {
       apiKey,
@@ -3405,6 +3491,46 @@ async function createAlchemyAAState(options) {
     };
   }
 }
+async function createAlchemyWalletApisState(params) {
+  const { createSmartWalletClient, alchemyWalletTransport } = await import("@alchemy/wallet-apis");
+  const signer = privateKeyToAccount(params.privateKey);
+  const walletClient = createSmartWalletClient(__spreadValues({
+    transport: alchemyWalletTransport({ apiKey: params.apiKey }),
+    chain: params.chain,
+    signer
+  }, params.gasPolicyId ? { paymaster: { policyId: params.gasPolicyId } } : {}));
+  let accountAddress = signer.address;
+  if (params.mode === "4337") {
+    const account = await walletClient.requestAccount();
+    accountAddress = account.address;
+  }
+  const sendCalls = async (calls) => {
+    var _a3, _b;
+    const result = await walletClient.sendCalls(__spreadProps(__spreadValues({}, params.mode === "4337" ? { account: accountAddress } : {}), {
+      calls
+    }));
+    const status = await walletClient.waitForCallsStatus({ id: result.id });
+    const transactionHash = (_b = (_a3 = status.receipts) == null ? void 0 : _a3[0]) == null ? void 0 : _b.transactionHash;
+    if (!transactionHash) {
+      throw new Error("Alchemy Wallets API did not return a transaction hash.");
+    }
+    return { transactionHash };
+  };
+  const AA = {
+    provider: "alchemy",
+    mode: params.mode,
+    AAAddress: accountAddress,
+    delegationAddress: params.mode === "7702" ? signer.address : void 0,
+    sendTransaction: async (call) => sendCalls([call]),
+    sendBatchTransaction: async (calls) => sendCalls(calls)
+  };
+  return {
+    plan: params.plan,
+    AA,
+    isPending: false,
+    error: null
+  };
+}
 async function createPimlicoAAState(options) {
   var _a3;
   const {
@@ -3468,6 +3594,42 @@ async function createPimlicoAAState(options) {
 }
 
 // src/cli/execution.ts
+var ERC20_SELECTORS = /* @__PURE__ */ new Set([
+  "0x095ea7b3",
+  // approve(address,uint256)
+  "0xa9059cbb",
+  // transfer(address,uint256)
+  "0x23b872dd"
+  // transferFrom(address,address,uint256)
+]);
+function callsContainTokenOperations(calls) {
+  return calls.some(
+    (call) => call.data && ERC20_SELECTORS.has(call.data.slice(0, 10).toLowerCase())
+  );
+}
+function maybeOverride4337ForTokenOps(params) {
+  const { mode, callList, chain, explicitMode } = params;
+  if (mode !== "4337" || !callsContainTokenOperations(callList)) {
+    return { mode, warned: false };
+  }
+  const chainConfig = getAAChainConfig(DEFAULT_AA_CONFIG, callList, {
+    [chain.id]: chain
+  });
+  if ((chainConfig == null ? void 0 : chainConfig.supportedModes.includes("7702")) && !explicitMode) {
+    console.log(
+      "\u26A0\uFE0F  4337 batch contains ERC-20 calls but tokens are in your EOA, not the 4337 smart account."
+    );
+    console.log("   Switching to 7702 (EOA keeps smart-account capabilities, no token transfer needed).");
+    return { mode: "7702", warned: true };
+  }
+  console.log(
+    "\u26A0\uFE0F  4337 batch contains ERC-20 calls. Tokens must be in the smart account, not your EOA."
+  );
+  console.log(
+    "   This batch may revert. Consider transferring tokens to the smart account first."
+  );
+  return { mode, warned: true };
+}
 function resolveAAProvider(config, options) {
   const provider = config.aaProvider;
   if (provider) {
@@ -3503,10 +3665,16 @@ function getResolvedAAMode(params) {
   if (!resolved) {
     throw new Error(`AA config resolution failed for provider "${provider}".`);
   }
+  const { mode: finalMode } = maybeOverride4337ForTokenOps({
+    mode: resolved.plan.mode,
+    callList,
+    chain,
+    explicitMode: Boolean(config.aaMode)
+  });
   return {
     execution: "aa",
     provider,
-    aaMode: resolved.plan.mode,
+    aaMode: finalMode,
     fallbackToEoa
   };
 }
@@ -3839,7 +4007,19 @@ async function signCommand(runtime) {
       try {
         const simResponse = await session.client.simulateBatch(
           state.sessionId,
-          pendingTxs.map((tx) => tx.id)
+          pendingTxs.map((tx) => {
+            var _a4;
+            return {
+              to: tx.to,
+              value: tx.value,
+              data: tx.data,
+              label: (_a4 = tx.description) != null ? _a4 : tx.id
+            };
+          }),
+          {
+            from: account.address,
+            chainId: primaryChainId
+          }
         );
         const { result: sim } = simResponse;
         if (!sim.batch_success) {

package/dist/index.cjs

@@ -619,10 +619,11 @@ var AomiClient = class {
   // Batch Simulation
   // ===========================================================================
   /**
-   * Simulate pending transactions as an atomic batch.
+   * Simulate transactions as an atomic batch.
    * Each tx sees state changes from previous txs (e.g., approve → swap).
+   * Sends full tx payloads — the backend does not look up by ID.
    */
-  async simulateBatch(sessionId, txIds) {
+  async simulateBatch(sessionId, transactions, options) {
     const url = joinApiPath(this.baseUrl, "/api/simulate");
     const headers = new Headers(
       withSessionHeader(sessionId, { "Content-Type": "application/json" })
@@ -630,13 +631,20 @@ var AomiClient = class {
     if (this.apiKey) {
       headers.set(API_KEY_HEADER, this.apiKey);
     }
+    const payload = {
+      transactions,
+      from: options == null ? void 0 : options.from,
+      chain_id: options == null ? void 0 : options.chainId
+    };
     const response = await fetch(url, {
       method: "POST",
       headers,
-      body: JSON.stringify({ tx_ids: txIds })
+      body: JSON.stringify(payload)
     });
     if (!response.ok) {
-      throw new Error(`HTTP ${response.status}: ${response.statusText}`);
+      const body = await response.text().catch(() => "");
+      throw new Error(`HTTP ${response.status}: ${response.statusText}${body ? `
+${body}` : ""}`);
     }
     return await response.json();
   }
@@ -902,6 +910,7 @@ var ClientSession = class extends TypedEventEmitter {
     this.pollTimer = null;
     this.unsubscribeSSE = null;
     this._isProcessing = false;
+    this._backendWasProcessing = false;
     this.walletRequests = [];
     this.walletRequestNextId = 1;
     this._messages = [];
@@ -1132,6 +1141,7 @@ var ClientSession = class extends TypedEventEmitter {
   startPolling() {
     var _a;
     if (this.pollTimer || this.closed) return;
+    this._backendWasProcessing = true;
     (_a = this.logger) == null ? void 0 : _a.debug("[session] polling started", this.sessionId);
     this.pollTimer = setInterval(() => {
       void this.pollTick();
@@ -1157,6 +1167,10 @@ var ClientSession = class extends TypedEventEmitter {
       if (!this.pollTimer) return;
       this.assertUserStateAligned(state.user_state);
       this.applyState(state);
+      if (this._backendWasProcessing && !state.is_processing) {
+        this.emit("backend_idle", void 0);
+      }
+      this._backendWasProcessing = !!state.is_processing;
       if (!state.is_processing && this.walletRequests.length === 0) {
         this.stopPolling();
         this._isProcessing = false;
@@ -1468,6 +1482,10 @@ async function executeViaAA(callList, providerState) {
   const receipt = callList.length > 1 ? await AA.sendBatchTransaction(callsPayload) : await AA.sendTransaction(callsPayload[0]);
   const txHash = receipt.transactionHash;
   const providerPrefix = AA.provider.toLowerCase();
+  let delegationAddress = AA.mode === "7702" ? AA.delegationAddress : void 0;
+  if (AA.mode === "7702" && !delegationAddress) {
+    delegationAddress = await resolve7702Delegation(txHash, callList);
+  }
   return {
     txHash,
     txHashes: [txHash],
@@ -1475,9 +1493,36 @@ async function executeViaAA(callList, providerState) {
     batched: callList.length > 1,
     sponsored: plan.sponsorship !== "disabled",
     AAAddress: AA.AAAddress,
-    delegationAddress: AA.mode === "7702" ? AA.delegationAddress : void 0
+    delegationAddress
   };
 }
+async function resolve7702Delegation(txHash, callList) {
+  var _a, _b, _c, _d;
+  try {
+    const { createPublicClient, http } = await import("viem");
+    const chainId = (_a = callList[0]) == null ? void 0 : _a.chainId;
+    if (!chainId) return void 0;
+    const { mainnet, polygon, arbitrum, optimism, base } = await import("viem/chains");
+    const knownChains = {
+      1: mainnet,
+      137: polygon,
+      42161: arbitrum,
+      10: optimism,
+      8453: base
+    };
+    const chain = knownChains[chainId];
+    if (!chain) return void 0;
+    const client = createPublicClient({ chain, transport: http() });
+    const tx = await client.getTransaction({ hash: txHash });
+    const authList = tx.authorizationList;
+    const target = (_d = (_b = authList == null ? void 0 : authList[0]) == null ? void 0 : _b.address) != null ? _d : (_c = authList == null ? void 0 : authList[0]) == null ? void 0 : _c.contractAddress;
+    if (target) {
+      return target;
+    }
+  } catch (e) {
+  }
+  return void 0;
+}
 async function executeViaEoa({
   callList,
   currentChainId,
@@ -1836,11 +1881,12 @@ function createPimlicoAAProvider({
 
 // src/aa/adapt.ts
 function adaptSmartAccount(account) {
+  const delegationAddress = account.mode === "7702" && account.delegationAddress && account.smartAccountAddress && account.delegationAddress.toLowerCase() === account.smartAccountAddress.toLowerCase() ? void 0 : account.delegationAddress;
   return {
     provider: account.provider,
     mode: account.mode,
     AAAddress: account.smartAccountAddress,
-    delegationAddress: account.delegationAddress,
+    delegationAddress,
     sendTransaction: async (call) => {
       const receipt = await account.sendTransaction(call);
       return { transactionHash: receipt.transactionHash };
@@ -1981,6 +2027,25 @@ async function createAlchemyAAState(options) {
   if (ownerParams.kind === "unsupported_adapter") {
     return getUnsupportedAdapterState(plan, ownerParams.adapter);
   }
+  if (owner.kind === "direct") {
+    try {
+      return await createAlchemyWalletApisState({
+        plan,
+        chain,
+        privateKey: owner.privateKey,
+        apiKey,
+        gasPolicyId,
+        mode: plan.mode
+      });
+    } catch (error) {
+      return {
+        plan,
+        AA: null,
+        isPending: false,
+        error: error instanceof Error ? error : new Error(String(error))
+      };
+    }
+  }
   try {
     const smartAccount = await (0, import_aa_alchemy.createAlchemySmartAccount)(__spreadProps(__spreadValues({}, ownerParams.ownerParams), {
       apiKey,
@@ -2012,6 +2077,46 @@ async function createAlchemyAAState(options) {
     };
   }
 }
+async function createAlchemyWalletApisState(params) {
+  const { createSmartWalletClient, alchemyWalletTransport } = await import("@alchemy/wallet-apis");
+  const signer = (0, import_accounts.privateKeyToAccount)(params.privateKey);
+  const walletClient = createSmartWalletClient(__spreadValues({
+    transport: alchemyWalletTransport({ apiKey: params.apiKey }),
+    chain: params.chain,
+    signer
+  }, params.gasPolicyId ? { paymaster: { policyId: params.gasPolicyId } } : {}));
+  let accountAddress = signer.address;
+  if (params.mode === "4337") {
+    const account = await walletClient.requestAccount();
+    accountAddress = account.address;
+  }
+  const sendCalls = async (calls) => {
+    var _a, _b;
+    const result = await walletClient.sendCalls(__spreadProps(__spreadValues({}, params.mode === "4337" ? { account: accountAddress } : {}), {
+      calls
+    }));
+    const status = await walletClient.waitForCallsStatus({ id: result.id });
+    const transactionHash = (_b = (_a = status.receipts) == null ? void 0 : _a[0]) == null ? void 0 : _b.transactionHash;
+    if (!transactionHash) {
+      throw new Error("Alchemy Wallets API did not return a transaction hash.");
+    }
+    return { transactionHash };
+  };
+  const AA = {
+    provider: "alchemy",
+    mode: params.mode,
+    AAAddress: accountAddress,
+    delegationAddress: params.mode === "7702" ? signer.address : void 0,
+    sendTransaction: async (call) => sendCalls([call]),
+    sendBatchTransaction: async (calls) => sendCalls(calls)
+  };
+  return {
+    plan: params.plan,
+    AA,
+    isPending: false,
+    error: null
+  };
+}
 async function createPimlicoAAState(options) {
   var _a;
   const {