@aomi-labs/client 0.1.8 → 0.1.10

package/dist/cli.js

@@ -70,22 +70,24 @@ ${list}`);
 function resolveExecutionMode(flags) {
   const flagAA = flags["aa"] === "true";
   const flagEoa = flags["eoa"] === "true";
+  const hasAASelection = flags["aa-provider"] !== void 0 || flags["aa-mode"] !== void 0;
   if (flagAA && flagEoa) {
     fatal("Choose only one of `--aa` or `--eoa`.");
   }
   if (flagAA) return "aa";
   if (flagEoa) return "eoa";
-  return "aa";
+  if (hasAASelection) return "aa";
+  return "auto";
 }
 function parseAAProvider(value) {
-  if (value === void 0) return void 0;
+  if (value === void 0 || value.trim() === "") return void 0;
   if (value === "alchemy" || value === "pimlico") {
     return value;
   }
   fatal("Unsupported AA provider. Use `alchemy` or `pimlico`.");
 }
 function parseAAMode(value) {
-  if (value === void 0) return void 0;
+  if (value === void 0 || value.trim() === "") return void 0;
   if (value === "4337" || value === "7702") {
     return value;
   }
@@ -1136,6 +1138,7 @@ function unwrapSystemEvent(event) {
 }
 
 // src/wallet-utils.ts
+import { getAddress } from "viem";
 function asRecord(value) {
   if (!value || typeof value !== "object" || Array.isArray(value))
     return void 0;
@@ -1159,12 +1162,25 @@ function parseChainId2(value) {
   const parsed = Number.parseInt(trimmed, 10);
   return Number.isFinite(parsed) ? parsed : void 0;
 }
+function normalizeAddress(value) {
+  if (typeof value !== "string") return void 0;
+  const trimmed = value.trim();
+  if (!trimmed) return void 0;
+  try {
+    return getAddress(trimmed);
+  } catch (e) {
+    if (/^0x[0-9a-fA-F]{40}$/.test(trimmed)) {
+      return getAddress(trimmed.toLowerCase());
+    }
+    return void 0;
+  }
+}
 function normalizeTxPayload(payload) {
   var _a3, _b, _c;
   const root = asRecord(payload);
   const args = getToolArgs(payload);
   const ctx = asRecord(root == null ? void 0 : root.ctx);
-  const to = typeof args.to === "string" ? args.to : void 0;
+  const to = normalizeAddress(args.to);
   if (!to) return null;
   const valueRaw = args.value;
   const value = typeof valueRaw === "string" ? valueRaw : typeof valueRaw === "number" && Number.isFinite(valueRaw) ? String(Math.trunc(valueRaw)) : void 0;
@@ -1570,6 +1586,22 @@ var ClientSession = class extends TypedEventEmitter {
   }
 };
 
+// src/cli/user-state.ts
+function buildCliUserState(publicKey, chainId) {
+  if (publicKey === void 0 && chainId === void 0) {
+    return void 0;
+  }
+  const userState = {};
+  if (publicKey !== void 0) {
+    userState.address = publicKey;
+    userState.isConnected = true;
+  }
+  if (chainId !== void 0) {
+    userState.chainId = chainId;
+  }
+  return userState;
+}
+
 // src/cli/context.ts
 function getOrCreateSession(runtime) {
   const { config } = runtime;
@@ -1617,8 +1649,9 @@ function getOrCreateSession(runtime) {
       publicKey: state.publicKey
     }
   );
-  if (state.publicKey) {
-    session.resolveWallet(state.publicKey, state.chainId);
+  const userState = buildCliUserState(state.publicKey, state.chainId);
+  if (userState) {
+    session.resolveUserState(userState);
   }
   return { session, state };
 }
@@ -1749,8 +1782,9 @@ async function chatCommand(runtime) {
   const { session, state } = getOrCreateSession(runtime);
   try {
     await applyRequestedModelIfPresent(runtime, session, state);
-    if (state.publicKey) {
-      session.resolveWallet(state.publicKey, state.chainId);
+    const userState = buildCliUserState(state.publicKey, state.chainId);
+    if (userState) {
+      session.resolveUserState(userState);
     }
     const capturedRequests = [];
     let printedAgentCount = 0;
@@ -1882,225 +1916,255 @@ async function chatCommand(runtime) {
   }
 }
 
-// src/cli/commands/control.ts
-async function statusCommand(runtime) {
-  var _a3, _b, _c, _d, _e, _f, _g, _h, _i;
-  if (!readState()) {
-    console.log("No active session");
-    printDataFileLocation();
-    return;
+// src/aa/types.ts
+function getAAChainConfig(config, calls, chainsById) {
+  if (!config.enabled || calls.length === 0) {
+    return null;
   }
-  const { session, state } = getOrCreateSession(runtime);
-  try {
-    const apiState = await session.client.fetchState(state.sessionId);
-    console.log(
-      JSON.stringify(
-        {
-          sessionId: state.sessionId,
-          baseUrl: state.baseUrl,
-          app: state.app,
-          model: (_a3 = state.model) != null ? _a3 : null,
-          isProcessing: (_b = apiState.is_processing) != null ? _b : false,
-          messageCount: (_d = (_c = apiState.messages) == null ? void 0 : _c.length) != null ? _d : 0,
-          title: (_e = apiState.title) != null ? _e : null,
-          pendingTxs: (_g = (_f = state.pendingTxs) == null ? void 0 : _f.length) != null ? _g : 0,
-          signedTxs: (_i = (_h = state.signedTxs) == null ? void 0 : _h.length) != null ? _i : 0
-        },
-        null,
-        2
-      )
-    );
-    printDataFileLocation();
-  } finally {
-    session.close();
+  const chainIds = Array.from(new Set(calls.map((call) => call.chainId)));
+  if (chainIds.length !== 1) {
+    return null;
   }
-}
-async function eventsCommand(runtime) {
-  if (!readState()) {
-    console.log("No active session");
-    return;
+  const chainId = chainIds[0];
+  if (!chainsById[chainId]) {
+    return null;
   }
-  const { session, state } = getOrCreateSession(runtime);
-  try {
-    const events = await session.client.getSystemEvents(state.sessionId);
-    console.log(JSON.stringify(events, null, 2));
-  } finally {
-    session.close();
+  const chainConfig = config.chains.find((item) => item.chainId === chainId);
+  if (!(chainConfig == null ? void 0 : chainConfig.enabled)) {
+    return null;
   }
-}
-async function modelsCommand(runtime) {
-  var _a3, _b;
-  const client = createControlClient(runtime);
-  const state = readState();
-  const sessionId = (_a3 = state == null ? void 0 : state.sessionId) != null ? _a3 : crypto.randomUUID();
-  const models = await client.getModels(sessionId, {
-    apiKey: (_b = runtime.config.apiKey) != null ? _b : state == null ? void 0 : state.apiKey
-  });
-  if (models.length === 0) {
-    console.log("No models available.");
-    return;
+  if (calls.length > 1 && !chainConfig.allowBatching) {
+    return null;
   }
-  for (const model of models) {
-    const marker = (state == null ? void 0 : state.model) === model ? "  (current)" : "";
-    console.log(`${model}${marker}`);
+  return chainConfig;
+}
+function buildAAExecutionPlan(config, chainConfig) {
+  const mode = chainConfig.supportedModes.includes(chainConfig.defaultMode) ? chainConfig.defaultMode : chainConfig.supportedModes[0];
+  if (!mode) {
+    throw new Error(`No smart account mode configured for chain ${chainConfig.chainId}`);
   }
+  return {
+    provider: config.provider,
+    chainId: chainConfig.chainId,
+    mode,
+    batchingEnabled: chainConfig.allowBatching,
+    sponsorship: chainConfig.sponsorship,
+    fallbackToEoa: config.fallbackToEoa
+  };
 }
-async function modelCommand(runtime) {
-  var _a3;
-  const subcommand = runtime.parsed.positional[0];
-  if (!subcommand || subcommand === "current") {
-    const state2 = readState();
-    if (!state2) {
-      console.log("No active session");
-      printDataFileLocation();
-      return;
+function mapCall(call) {
+  return {
+    to: call.to,
+    value: BigInt(call.value),
+    data: call.data ? call.data : void 0
+  };
+}
+var DEFAULT_AA_CONFIG = {
+  enabled: true,
+  provider: "alchemy",
+  fallbackToEoa: true,
+  chains: [
+    {
+      chainId: 1,
+      enabled: true,
+      defaultMode: "7702",
+      supportedModes: ["4337", "7702"],
+      allowBatching: true,
+      sponsorship: "optional"
+    },
+    {
+      chainId: 137,
+      enabled: true,
+      defaultMode: "4337",
+      supportedModes: ["4337", "7702"],
+      allowBatching: true,
+      sponsorship: "optional"
+    },
+    {
+      chainId: 42161,
+      enabled: true,
+      defaultMode: "4337",
+      supportedModes: ["4337", "7702"],
+      allowBatching: true,
+      sponsorship: "optional"
+    },
+    {
+      chainId: 10,
+      enabled: true,
+      defaultMode: "4337",
+      supportedModes: ["4337", "7702"],
+      allowBatching: true,
+      sponsorship: "optional"
+    },
+    {
+      chainId: 8453,
+      enabled: true,
+      defaultMode: "4337",
+      supportedModes: ["4337", "7702"],
+      allowBatching: true,
+      sponsorship: "optional"
     }
-    console.log((_a3 = state2.model) != null ? _a3 : "(default backend model)");
-    printDataFileLocation();
-    return;
-  }
-  if (subcommand !== "set") {
-    fatal("Usage: aomi model set <rig>\n       aomi model current");
-  }
-  const model = runtime.parsed.positional.slice(1).join(" ").trim();
-  if (!model) {
-    fatal("Usage: aomi model set <rig>");
+  ]
+};
+var DISABLED_PROVIDER_STATE = {
+  plan: null,
+  AA: void 0,
+  isPending: false,
+  error: null
+};
+async function executeWalletCalls(params) {
+  const {
+    callList,
+    currentChainId,
+    capabilities,
+    localPrivateKey,
+    providerState,
+    sendCallsSyncAsync,
+    sendTransactionAsync,
+    switchChainAsync,
+    chainsById,
+    getPreferredRpcUrl: getPreferredRpcUrl2
+  } = params;
+  if (providerState.plan && providerState.AA) {
+    return executeViaAA(callList, providerState);
   }
-  const { session, state } = getOrCreateSession(runtime);
-  try {
-    await applyModelSelection(session, state, model);
-    console.log(`Model set to ${model}`);
-    printDataFileLocation();
-  } finally {
-    session.close();
+  if (providerState.plan && providerState.error && !providerState.plan.fallbackToEoa) {
+    throw providerState.error;
   }
+  return executeViaEoa({
+    callList,
+    currentChainId,
+    capabilities,
+    localPrivateKey,
+    sendCallsSyncAsync,
+    sendTransactionAsync,
+    switchChainAsync,
+    chainsById,
+    getPreferredRpcUrl: getPreferredRpcUrl2
+  });
 }
-
-// src/cli/tables.ts
-var MAX_TABLE_VALUE_WIDTH = 72;
-var MAX_TX_JSON_WIDTH = 96;
-var MAX_TX_ROWS = 8;
-function truncateCell(value, maxWidth) {
-  if (value.length <= maxWidth) return value;
-  return `${value.slice(0, maxWidth - 1)}\u2026`;
-}
-function padRight(value, width) {
-  return value.padEnd(width, " ");
-}
-function estimateTokenCount(messages) {
+async function executeViaAA(callList, providerState) {
   var _a3;
-  let totalChars = 0;
-  for (const message of messages) {
-    const content = formatLogContent(message.content);
-    if (content) {
-      totalChars += content.length + 1;
-    }
-    if ((_a3 = message.tool_result) == null ? void 0 : _a3[1]) {
-      totalChars += message.tool_result[1].length;
-    }
+  const AA = providerState.AA;
+  const plan = providerState.plan;
+  if (!AA || !plan) {
+    throw (_a3 = providerState.error) != null ? _a3 : new Error("smart_account_unavailable");
   }
-  return Math.round(totalChars / 4);
-}
-function toPendingTxMetadata(tx) {
-  var _a3, _b, _c, _d;
-  return {
-    id: tx.id,
-    kind: tx.kind,
-    to: (_a3 = tx.to) != null ? _a3 : null,
-    value: (_b = tx.value) != null ? _b : null,
-    chainId: (_c = tx.chainId) != null ? _c : null,
-    description: (_d = tx.description) != null ? _d : null,
-    timestamp: new Date(tx.timestamp).toISOString()
-  };
-}
-function toSignedTxMetadata(tx) {
-  var _a3, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o;
+  const callsPayload = callList.map(mapCall);
+  const receipt = callList.length > 1 ? await AA.sendBatchTransaction(callsPayload) : await AA.sendTransaction(callsPayload[0]);
+  const txHash = receipt.transactionHash;
+  const providerPrefix = AA.provider.toLowerCase();
   return {
-    id: tx.id,
-    kind: tx.kind,
-    txHash: (_a3 = tx.txHash) != null ? _a3 : null,
-    txHashes: (_b = tx.txHashes) != null ? _b : null,
-    executionKind: (_c = tx.executionKind) != null ? _c : null,
-    aaProvider: (_d = tx.aaProvider) != null ? _d : null,
-    aaMode: (_e = tx.aaMode) != null ? _e : null,
-    batched: (_f = tx.batched) != null ? _f : null,
-    sponsored: (_g = tx.sponsored) != null ? _g : null,
-    AAAddress: (_h = tx.AAAddress) != null ? _h : null,
-    delegationAddress: (_i = tx.delegationAddress) != null ? _i : null,
-    signature: (_j = tx.signature) != null ? _j : null,
-    from: (_k = tx.from) != null ? _k : null,
-    to: (_l = tx.to) != null ? _l : null,
-    value: (_m = tx.value) != null ? _m : null,
-    chainId: (_n = tx.chainId) != null ? _n : null,
-    description: (_o = tx.description) != null ? _o : null,
-    timestamp: new Date(tx.timestamp).toISOString()
+    txHash,
+    txHashes: [txHash],
+    executionKind: `${providerPrefix}_${AA.mode}`,
+    batched: callList.length > 1,
+    sponsored: plan.sponsorship !== "disabled",
+    AAAddress: AA.AAAddress,
+    delegationAddress: AA.mode === "7702" ? AA.delegationAddress : void 0
   };
 }
-function printKeyValueTable(rows, color = CYAN) {
-  const labels = rows.map(([label]) => label);
-  const values = rows.map(
-    ([, value]) => truncateCell(value, MAX_TABLE_VALUE_WIDTH)
-  );
-  const keyWidth = Math.max("field".length, ...labels.map((label) => label.length));
-  const valueWidth = Math.max("value".length, ...values.map((value) => value.length));
-  const border = `+${"-".repeat(keyWidth + 2)}+${"-".repeat(valueWidth + 2)}+`;
-  console.log(`${color}${border}${RESET}`);
-  console.log(
-    `${color}| ${padRight("field", keyWidth)} | ${padRight("value", valueWidth)} |${RESET}`
-  );
-  console.log(`${color}${border}${RESET}`);
-  for (let i = 0; i < rows.length; i++) {
-    console.log(
-      `${color}| ${padRight(labels[i], keyWidth)} | ${padRight(values[i], valueWidth)} |${RESET}`
-    );
-    console.log(`${color}${border}${RESET}`);
+async function executeViaEoa({
+  callList,
+  currentChainId,
+  capabilities,
+  localPrivateKey,
+  sendCallsSyncAsync,
+  sendTransactionAsync,
+  switchChainAsync,
+  chainsById,
+  getPreferredRpcUrl: getPreferredRpcUrl2
+}) {
+  var _a3, _b;
+  const { createPublicClient, createWalletClient: createWalletClient2, http: http2 } = await import("viem");
+  const { privateKeyToAccount: privateKeyToAccount3 } = await import("viem/accounts");
+  const hashes = [];
+  if (localPrivateKey) {
+    for (const call of callList) {
+      const chain = chainsById[call.chainId];
+      if (!chain) {
+        throw new Error(`Unsupported chain ${call.chainId}`);
+      }
+      const rpcUrl = getPreferredRpcUrl2(chain);
+      if (!rpcUrl) {
+        throw new Error(`No RPC for chain ${call.chainId}`);
+      }
+      const account = privateKeyToAccount3(localPrivateKey);
+      const walletClient = createWalletClient2({
+        account,
+        chain,
+        transport: http2(rpcUrl)
+      });
+      const hash = await walletClient.sendTransaction({
+        account,
+        to: call.to,
+        value: BigInt(call.value),
+        data: call.data ? call.data : void 0
+      });
+      const publicClient = createPublicClient({
+        chain,
+        transport: http2(rpcUrl)
+      });
+      await publicClient.waitForTransactionReceipt({ hash });
+      hashes.push(hash);
+    }
+    return {
+      txHash: hashes[hashes.length - 1],
+      txHashes: hashes,
+      executionKind: "eoa",
+      batched: hashes.length > 1,
+      sponsored: false
+    };
   }
-}
-function printTransactionTable(pendingTxs, signedTxs, color = GREEN) {
-  const rows = [
-    ...pendingTxs.map((tx) => ({
-      status: "pending",
-      metadata: toPendingTxMetadata(tx)
-    })),
-    ...signedTxs.map((tx) => ({
-      status: "signed",
-      metadata: toSignedTxMetadata(tx)
-    }))
-  ];
-  if (rows.length === 0) {
-    console.log(`${YELLOW}No transactions in local CLI state.${RESET}`);
-    return;
+  const chainIds = Array.from(new Set(callList.map((call) => call.chainId)));
+  if (chainIds.length > 1) {
+    throw new Error("mixed_chain_bundle_not_supported");
   }
-  const visibleRows = rows.slice(0, MAX_TX_ROWS);
-  const statusWidth = Math.max(
-    "status".length,
-    ...visibleRows.map((row) => row.status.length)
-  );
-  const jsonCells = visibleRows.map(
-    (row) => truncateCell(JSON.stringify(row.metadata), MAX_TX_JSON_WIDTH)
-  );
-  const jsonWidth = Math.max("metadata_json".length, ...jsonCells.map((v) => v.length));
-  const border = `+${"-".repeat(statusWidth + 2)}+${"-".repeat(jsonWidth + 2)}+`;
-  console.log(`${color}${border}${RESET}`);
-  console.log(
-    `${color}| ${padRight("status", statusWidth)} | ${padRight("metadata_json", jsonWidth)} |${RESET}`
-  );
-  console.log(`${color}${border}${RESET}`);
-  for (let i = 0; i < visibleRows.length; i++) {
-    console.log(
-      `${color}| ${padRight(visibleRows[i].status, statusWidth)} | ${padRight(jsonCells[i], jsonWidth)} |${RESET}`
-    );
-    console.log(`${color}${border}${RESET}`);
+  const chainId = chainIds[0];
+  if (currentChainId !== chainId) {
+    await switchChainAsync({ chainId });
   }
-  if (rows.length > MAX_TX_ROWS) {
-    const omitted = rows.length - MAX_TX_ROWS;
-    console.log(`${DIM}${omitted} transaction rows omitted${RESET}`);
+  const chainCaps = capabilities == null ? void 0 : capabilities[`eip155:${chainId}`];
+  const atomicStatus = (_a3 = chainCaps == null ? void 0 : chainCaps.atomic) == null ? void 0 : _a3.status;
+  const canUseSendCalls = atomicStatus === "supported" || atomicStatus === "ready";
+  if (canUseSendCalls) {
+    const batchResult = await sendCallsSyncAsync({
+      calls: callList.map(mapCall),
+      capabilities: {
+        atomic: {
+          required: true
+        }
+      }
+    });
+    const receipts = (_b = batchResult.receipts) != null ? _b : [];
+    for (const receipt of receipts) {
+      if (receipt.transactionHash) {
+        hashes.push(receipt.transactionHash);
+      }
+    }
+  } else {
+    for (const call of callList) {
+      const hash = await sendTransactionAsync({
+        chainId: call.chainId,
+        to: call.to,
+        value: BigInt(call.value),
+        data: call.data ? call.data : void 0
+      });
+      hashes.push(hash);
+    }
   }
+  return {
+    txHash: hashes[hashes.length - 1],
+    txHashes: hashes,
+    executionKind: "eoa",
+    batched: hashes.length > 1,
+    sponsored: false
+  };
 }
 
-// src/cli/commands/history.ts
-async function logCommand(runtime) {
-  var _a3, _b, _c, _d, _e;
+// src/cli/commands/control.ts
+async function statusCommand(runtime) {
+  var _a3, _b, _c, _d, _e, _f, _g, _h, _i, _j;
   if (!readState()) {
     console.log("No active session");
     printDataFileLocation();
@@ -2109,438 +2173,475 @@ async function logCommand(runtime) {
   const { session, state } = getOrCreateSession(runtime);
   try {
     const apiState = await session.client.fetchState(state.sessionId);
-    const messages = (_a3 = apiState.messages) != null ? _a3 : [];
-    const pendingTxs = (_b = state.pendingTxs) != null ? _b : [];
-    const signedTxs = (_c = state.signedTxs) != null ? _c : [];
-    const toolCalls = messages.filter((msg) => Boolean(msg.tool_result)).length;
-    const tokenCountEstimate = estimateTokenCount(messages);
-    const topic = (_d = apiState.title) != null ? _d : "Untitled Session";
-    if (messages.length === 0) {
-      console.log("No messages in this session.");
-      printDataFileLocation();
-      return;
-    }
-    console.log(`------ Session id: ${state.sessionId} ------`);
-    printKeyValueTable([
-      ["topic", topic],
-      ["msg count", String(messages.length)],
-      ["token count", `${tokenCountEstimate} (estimated)`],
-      ["tool calls", String(toolCalls)],
-      [
-        "transactions",
-        `${pendingTxs.length + signedTxs.length} (${pendingTxs.length} pending, ${signedTxs.length} signed)`
-      ]
-    ]);
-    console.log("Transactions metadata (JSON):");
-    printTransactionTable(pendingTxs, signedTxs);
-    console.log("-------------------- Messages --------------------");
-    for (const msg of messages) {
-      const content = formatLogContent(msg.content);
-      let time = "";
-      if (msg.timestamp) {
-        const raw = msg.timestamp;
-        const numeric = /^\d+$/.test(raw) ? parseInt(raw, 10) : NaN;
-        const date = !Number.isNaN(numeric) ? new Date(numeric < 1e12 ? numeric * 1e3 : numeric) : new Date(raw);
-        time = Number.isNaN(date.getTime()) ? "" : `${DIM}${date.toLocaleTimeString()}${RESET} `;
-      }
-      const sender = (_e = msg.sender) != null ? _e : "unknown";
-      if (sender === "user") {
-        if (content) {
-          console.log(`${time}${CYAN}\u{1F464} You:${RESET} ${content}`);
-        }
-      } else if (sender === "agent" || sender === "assistant") {
-        if (msg.tool_result) {
-          const [toolName, result] = msg.tool_result;
-          console.log(
-            `${time}${GREEN}\u{1F527} [${toolName}]${RESET} ${formatToolResultPreview(result)}`
-          );
-        }
-        if (content) {
-          console.log(`${time}${CYAN}\u{1F916} Agent:${RESET} ${content}`);
-        }
-      } else if (sender === "system") {
-        if (content && !content.startsWith("Response of system endpoint:")) {
-          console.log(`${time}${YELLOW}\u2699\uFE0F  System:${RESET} ${content}`);
-        }
-      } else {
-        if (content) {
-          console.log(`${time}${DIM}[${sender}]${RESET} ${content}`);
-        }
-      }
-    }
-    console.log(`
-${DIM}\u2014 ${messages.length} messages \u2014${RESET}`);
+    console.log(
+      JSON.stringify(
+        {
+          sessionId: state.sessionId,
+          baseUrl: state.baseUrl,
+          app: state.app,
+          model: (_a3 = state.model) != null ? _a3 : null,
+          chainId: (_b = state.chainId) != null ? _b : null,
+          isProcessing: (_c = apiState.is_processing) != null ? _c : false,
+          messageCount: (_e = (_d = apiState.messages) == null ? void 0 : _d.length) != null ? _e : 0,
+          title: (_f = apiState.title) != null ? _f : null,
+          pendingTxs: (_h = (_g = state.pendingTxs) == null ? void 0 : _g.length) != null ? _h : 0,
+          signedTxs: (_j = (_i = state.signedTxs) == null ? void 0 : _i.length) != null ? _j : 0
+        },
+        null,
+        2
+      )
+    );
     printDataFileLocation();
   } finally {
     session.close();
   }
 }
-function closeCommand(runtime) {
-  if (readState()) {
-    const { session } = getOrCreateSession(runtime);
-    session.close();
-  }
-  clearState();
-  console.log("Session closed");
-}
-
-// src/cli/commands/sessions.ts
-async function fetchRemoteSessionStats(record) {
-  var _a3, _b;
-  const client = new AomiClient({
-    baseUrl: record.state.baseUrl,
-    apiKey: record.state.apiKey
-  });
+async function eventsCommand(runtime) {
+  if (!readState()) {
+    console.log("No active session");
+    return;
+  }
+  const { session, state } = getOrCreateSession(runtime);
   try {
-    const apiState = await client.fetchState(record.sessionId);
-    const messages = (_a3 = apiState.messages) != null ? _a3 : [];
-    return {
-      topic: (_b = apiState.title) != null ? _b : "Untitled Session",
-      messageCount: messages.length,
-      tokenCountEstimate: estimateTokenCount(messages),
-      toolCalls: messages.filter((msg) => Boolean(msg.tool_result)).length
-    };
-  } catch (e) {
-    return null;
+    const events = await session.client.getSystemEvents(state.sessionId);
+    console.log(JSON.stringify(events, null, 2));
+  } finally {
+    session.close();
   }
 }
-function printSessionSummary(record, stats, isActive) {
+async function appsCommand(runtime) {
   var _a3, _b, _c;
-  const pendingTxs = (_a3 = record.state.pendingTxs) != null ? _a3 : [];
-  const signedTxs = (_b = record.state.signedTxs) != null ? _b : [];
-  const header = isActive ? `\u{1F9F5} Session id: ${record.sessionId} (session-${record.localId}, active)` : `\u{1F9F5} Session id: ${record.sessionId} (session-${record.localId})`;
-  console.log(`${YELLOW}------ ${header} ------${RESET}`);
-  printKeyValueTable([
-    ["\u{1F9E0} topic", (_c = stats == null ? void 0 : stats.topic) != null ? _c : "Unavailable (fetch failed)"],
-    ["\u{1F4AC} msg count", stats ? String(stats.messageCount) : "n/a"],
-    [
-      "\u{1F9EE} token count",
-      stats ? `${stats.tokenCountEstimate} (estimated)` : "n/a"
-    ],
-    ["\u{1F6E0} tool calls", stats ? String(stats.toolCalls) : "n/a"],
-    [
-      "\u{1F4B8} transactions",
-      `${pendingTxs.length + signedTxs.length} (${pendingTxs.length} pending, ${signedTxs.length} signed)`
-    ]
-  ]);
-  console.log();
-  console.log(`${YELLOW}\u{1F4BE} Transactions metadata (JSON):${RESET}`);
-  printTransactionTable(pendingTxs, signedTxs);
+  const client = createControlClient(runtime);
+  const state = readState();
+  const sessionId = (_a3 = state == null ? void 0 : state.sessionId) != null ? _a3 : crypto.randomUUID();
+  const apps = await client.getApps(sessionId, {
+    publicKey: runtime.config.publicKey,
+    apiKey: (_b = runtime.config.apiKey) != null ? _b : state == null ? void 0 : state.apiKey
+  });
+  if (apps.length === 0) {
+    console.log("No apps available.");
+    return;
+  }
+  const currentApp = (_c = state == null ? void 0 : state.app) != null ? _c : runtime.config.app;
+  for (const app of apps) {
+    const marker = currentApp === app ? "  (current)" : "";
+    console.log(`${app}${marker}`);
+  }
 }
-async function sessionsCommand(_runtime) {
-  var _a3;
-  const sessions = listStoredSessions().sort((a, b) => b.updatedAt - a.updatedAt);
-  if (sessions.length === 0) {
-    console.log("No local sessions.");
-    printDataFileLocation();
+async function modelsCommand(runtime) {
+  var _a3, _b;
+  const client = createControlClient(runtime);
+  const state = readState();
+  const sessionId = (_a3 = state == null ? void 0 : state.sessionId) != null ? _a3 : crypto.randomUUID();
+  const models = await client.getModels(sessionId, {
+    apiKey: (_b = runtime.config.apiKey) != null ? _b : state == null ? void 0 : state.apiKey
+  });
+  if (models.length === 0) {
+    console.log("No models available.");
     return;
   }
-  const activeSessionId = (_a3 = readState()) == null ? void 0 : _a3.sessionId;
-  const statsResults = await Promise.all(
-    sessions.map((record) => fetchRemoteSessionStats(record))
-  );
-  for (let i = 0; i < sessions.length; i++) {
-    printSessionSummary(
-      sessions[i],
-      statsResults[i],
-      sessions[i].sessionId === activeSessionId
-    );
-    if (i < sessions.length - 1) {
-      console.log();
-    }
+  for (const model of models) {
+    const marker = (state == null ? void 0 : state.model) === model ? "  (current)" : "";
+    console.log(`${model}${marker}`);
   }
-  printDataFileLocation();
 }
-function sessionCommand(runtime) {
+async function appCommand(runtime) {
+  var _a3;
   const subcommand = runtime.parsed.positional[0];
-  const selector = runtime.parsed.positional[1];
-  if (subcommand === "resume") {
-    if (!selector) {
-      fatal("Usage: aomi session resume <session-id|session-N|N>");
-    }
-    const resumed = setActiveSession(selector);
-    if (!resumed) {
-      fatal(`No local session found for selector "${selector}".`);
+  if (!subcommand || subcommand === "current") {
+    const state = readState();
+    if (!state) {
+      console.log("No active session");
+      printDataFileLocation();
+      return;
     }
-    console.log(`Active session set to ${resumed.sessionId} (session-${resumed.localId}).`);
+    console.log((_a3 = state.app) != null ? _a3 : "(default)");
     printDataFileLocation();
     return;
   }
-  if (subcommand === "delete") {
-    if (!selector) {
-      fatal("Usage: aomi session delete <session-id|session-N|N>");
-    }
-    const deleted = deleteStoredSession(selector);
-    if (!deleted) {
-      fatal(`No local session found for selector "${selector}".`);
-    }
-    console.log(`Deleted local session ${deleted.sessionId} (session-${deleted.localId}).`);
-    const active = readState();
-    if (active) {
-      console.log(`Active session: ${active.sessionId}`);
-    } else {
+  if (subcommand === "list") {
+    await appsCommand(runtime);
+    return;
+  }
+  fatal("Usage: aomi app list\n       aomi app current");
+}
+async function modelCommand(runtime) {
+  var _a3;
+  const subcommand = runtime.parsed.positional[0];
+  if (!subcommand || subcommand === "current") {
+    const state2 = readState();
+    if (!state2) {
       console.log("No active session");
+      printDataFileLocation();
+      return;
     }
+    console.log((_a3 = state2.model) != null ? _a3 : "(default backend model)");
     printDataFileLocation();
     return;
   }
-  fatal(
-    "Usage: aomi session resume <session-id|session-N|N>\n       aomi session delete <session-id|session-N|N>"
-  );
-}
-
-// src/cli/commands/wallet.ts
-import { createWalletClient, http } from "viem";
-import { createInterface } from "readline/promises";
-import { privateKeyToAccount as privateKeyToAccount2 } from "viem/accounts";
-import * as viemChains from "viem/chains";
-
-// src/aa/types.ts
-function getAAChainConfig(config, calls, chainsById) {
-  if (!config.enabled || calls.length === 0) {
-    return null;
+  if (subcommand === "list") {
+    await modelsCommand(runtime);
+    return;
   }
-  const chainIds = Array.from(new Set(calls.map((call) => call.chainId)));
-  if (chainIds.length !== 1) {
-    return null;
+  if (subcommand !== "set") {
+    fatal("Usage: aomi model list\n       aomi model set <rig>\n       aomi model current");
   }
-  const chainId = chainIds[0];
-  if (!chainsById[chainId]) {
-    return null;
+  const model = runtime.parsed.positional.slice(1).join(" ").trim();
+  if (!model) {
+    fatal("Usage: aomi model set <rig>");
   }
-  const chainConfig = config.chains.find((item) => item.chainId === chainId);
-  if (!(chainConfig == null ? void 0 : chainConfig.enabled)) {
-    return null;
+  const { session, state } = getOrCreateSession(runtime);
+  try {
+    await applyModelSelection(session, state, model);
+    console.log(`Model set to ${model}`);
+    printDataFileLocation();
+  } finally {
+    session.close();
   }
-  if (calls.length > 1 && !chainConfig.allowBatching) {
-    return null;
+}
+function chainsCommand() {
+  var _a3;
+  const state = readState();
+  const currentChainId = state == null ? void 0 : state.chainId;
+  for (const id of SUPPORTED_CHAIN_IDS) {
+    const name = (_a3 = CHAIN_NAMES[id]) != null ? _a3 : `Chain ${id}`;
+    const aaChain = DEFAULT_AA_CONFIG.chains.find((c) => c.chainId === id);
+    const aaInfo = (aaChain == null ? void 0 : aaChain.enabled) ? `  AA: ${aaChain.defaultMode} (${aaChain.supportedModes.join(", ")})` : "";
+    const marker = currentChainId === id ? "  (current)" : "";
+    console.log(`${id}  ${name}${aaInfo}${marker}`);
   }
-  return chainConfig;
 }
-function buildAAExecutionPlan(config, chainConfig) {
-  const mode = chainConfig.supportedModes.includes(chainConfig.defaultMode) ? chainConfig.defaultMode : chainConfig.supportedModes[0];
-  if (!mode) {
-    throw new Error(`No smart account mode configured for chain ${chainConfig.chainId}`);
+function chainCommand(runtime) {
+  const subcommand = runtime.parsed.positional[0];
+  if (!subcommand || subcommand === "list") {
+    chainsCommand();
+    return;
+  }
+  fatal("Usage: aomi chain list");
+}
+
+// src/cli/tables.ts
+var MAX_TABLE_VALUE_WIDTH = 72;
+var MAX_TX_JSON_WIDTH = 96;
+var MAX_TX_ROWS = 8;
+function truncateCell(value, maxWidth) {
+  if (value.length <= maxWidth) return value;
+  return `${value.slice(0, maxWidth - 1)}\u2026`;
+}
+function padRight(value, width) {
+  return value.padEnd(width, " ");
+}
+function estimateTokenCount(messages) {
+  var _a3;
+  let totalChars = 0;
+  for (const message of messages) {
+    const content = formatLogContent(message.content);
+    if (content) {
+      totalChars += content.length + 1;
+    }
+    if ((_a3 = message.tool_result) == null ? void 0 : _a3[1]) {
+      totalChars += message.tool_result[1].length;
+    }
   }
+  return Math.round(totalChars / 4);
+}
+function toPendingTxMetadata(tx) {
+  var _a3, _b, _c, _d;
   return {
-    provider: config.provider,
-    chainId: chainConfig.chainId,
-    mode,
-    batchingEnabled: chainConfig.allowBatching,
-    sponsorship: chainConfig.sponsorship,
-    fallbackToEoa: config.fallbackToEoa
+    id: tx.id,
+    kind: tx.kind,
+    to: (_a3 = tx.to) != null ? _a3 : null,
+    value: (_b = tx.value) != null ? _b : null,
+    chainId: (_c = tx.chainId) != null ? _c : null,
+    description: (_d = tx.description) != null ? _d : null,
+    timestamp: new Date(tx.timestamp).toISOString()
   };
 }
-function mapCall(call) {
+function toSignedTxMetadata(tx) {
+  var _a3, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o;
   return {
-    to: call.to,
-    value: BigInt(call.value),
-    data: call.data ? call.data : void 0
+    id: tx.id,
+    kind: tx.kind,
+    txHash: (_a3 = tx.txHash) != null ? _a3 : null,
+    txHashes: (_b = tx.txHashes) != null ? _b : null,
+    executionKind: (_c = tx.executionKind) != null ? _c : null,
+    aaProvider: (_d = tx.aaProvider) != null ? _d : null,
+    aaMode: (_e = tx.aaMode) != null ? _e : null,
+    batched: (_f = tx.batched) != null ? _f : null,
+    sponsored: (_g = tx.sponsored) != null ? _g : null,
+    AAAddress: (_h = tx.AAAddress) != null ? _h : null,
+    delegationAddress: (_i = tx.delegationAddress) != null ? _i : null,
+    signature: (_j = tx.signature) != null ? _j : null,
+    from: (_k = tx.from) != null ? _k : null,
+    to: (_l = tx.to) != null ? _l : null,
+    value: (_m = tx.value) != null ? _m : null,
+    chainId: (_n = tx.chainId) != null ? _n : null,
+    description: (_o = tx.description) != null ? _o : null,
+    timestamp: new Date(tx.timestamp).toISOString()
   };
 }
-var DEFAULT_AA_CONFIG = {
-  enabled: true,
-  provider: "alchemy",
-  fallbackToEoa: true,
-  chains: [
-    {
-      chainId: 1,
-      enabled: true,
-      defaultMode: "7702",
-      supportedModes: ["4337", "7702"],
-      allowBatching: true,
-      sponsorship: "optional"
-    },
-    {
-      chainId: 137,
-      enabled: true,
-      defaultMode: "4337",
-      supportedModes: ["4337", "7702"],
-      allowBatching: true,
-      sponsorship: "optional"
-    },
-    {
-      chainId: 42161,
-      enabled: true,
-      defaultMode: "4337",
-      supportedModes: ["4337", "7702"],
-      allowBatching: true,
-      sponsorship: "optional"
-    },
-    {
-      chainId: 10,
-      enabled: true,
-      defaultMode: "4337",
-      supportedModes: ["4337", "7702"],
-      allowBatching: true,
-      sponsorship: "optional"
-    },
-    {
-      chainId: 8453,
-      enabled: true,
-      defaultMode: "4337",
-      supportedModes: ["4337", "7702"],
-      allowBatching: true,
-      sponsorship: "optional"
-    }
-  ]
-};
-var DISABLED_PROVIDER_STATE = {
-  plan: null,
-  AA: void 0,
-  isPending: false,
-  error: null
-};
-async function executeWalletCalls(params) {
-  const {
-    callList,
-    currentChainId,
-    capabilities,
-    localPrivateKey,
-    providerState,
-    sendCallsSyncAsync,
-    sendTransactionAsync,
-    switchChainAsync,
-    chainsById,
-    getPreferredRpcUrl: getPreferredRpcUrl2
-  } = params;
-  if (providerState.plan && providerState.AA) {
-    return executeViaAA(callList, providerState);
-  }
-  if (providerState.plan && providerState.error && !providerState.plan.fallbackToEoa) {
-    throw providerState.error;
+function printKeyValueTable(rows, color = CYAN) {
+  const labels = rows.map(([label]) => label);
+  const values = rows.map(
+    ([, value]) => truncateCell(value, MAX_TABLE_VALUE_WIDTH)
+  );
+  const keyWidth = Math.max("field".length, ...labels.map((label) => label.length));
+  const valueWidth = Math.max("value".length, ...values.map((value) => value.length));
+  const border = `+${"-".repeat(keyWidth + 2)}+${"-".repeat(valueWidth + 2)}+`;
+  console.log(`${color}${border}${RESET}`);
+  console.log(
+    `${color}| ${padRight("field", keyWidth)} | ${padRight("value", valueWidth)} |${RESET}`
+  );
+  console.log(`${color}${border}${RESET}`);
+  for (let i = 0; i < rows.length; i++) {
+    console.log(
+      `${color}| ${padRight(labels[i], keyWidth)} | ${padRight(values[i], valueWidth)} |${RESET}`
+    );
+    console.log(`${color}${border}${RESET}`);
   }
-  return executeViaEoa({
-    callList,
-    currentChainId,
-    capabilities,
-    localPrivateKey,
-    sendCallsSyncAsync,
-    sendTransactionAsync,
-    switchChainAsync,
-    chainsById,
-    getPreferredRpcUrl: getPreferredRpcUrl2
-  });
 }
-async function executeViaAA(callList, providerState) {
-  var _a3;
-  const AA = providerState.AA;
-  const plan = providerState.plan;
-  if (!AA || !plan) {
-    throw (_a3 = providerState.error) != null ? _a3 : new Error("smart_account_unavailable");
+function printTransactionTable(pendingTxs, signedTxs, color = GREEN) {
+  const rows = [
+    ...pendingTxs.map((tx) => ({
+      status: "pending",
+      metadata: toPendingTxMetadata(tx)
+    })),
+    ...signedTxs.map((tx) => ({
+      status: "signed",
+      metadata: toSignedTxMetadata(tx)
+    }))
+  ];
+  if (rows.length === 0) {
+    console.log(`${YELLOW}No transactions in local CLI state.${RESET}`);
+    return;
+  }
+  const visibleRows = rows.slice(0, MAX_TX_ROWS);
+  const statusWidth = Math.max(
+    "status".length,
+    ...visibleRows.map((row) => row.status.length)
+  );
+  const jsonCells = visibleRows.map(
+    (row) => truncateCell(JSON.stringify(row.metadata), MAX_TX_JSON_WIDTH)
+  );
+  const jsonWidth = Math.max("metadata_json".length, ...jsonCells.map((v) => v.length));
+  const border = `+${"-".repeat(statusWidth + 2)}+${"-".repeat(jsonWidth + 2)}+`;
+  console.log(`${color}${border}${RESET}`);
+  console.log(
+    `${color}| ${padRight("status", statusWidth)} | ${padRight("metadata_json", jsonWidth)} |${RESET}`
+  );
+  console.log(`${color}${border}${RESET}`);
+  for (let i = 0; i < visibleRows.length; i++) {
+    console.log(
+      `${color}| ${padRight(visibleRows[i].status, statusWidth)} | ${padRight(jsonCells[i], jsonWidth)} |${RESET}`
+    );
+    console.log(`${color}${border}${RESET}`);
+  }
+  if (rows.length > MAX_TX_ROWS) {
+    const omitted = rows.length - MAX_TX_ROWS;
+    console.log(`${DIM}${omitted} transaction rows omitted${RESET}`);
   }
-  const callsPayload = callList.map(mapCall);
-  const receipt = callList.length > 1 ? await AA.sendBatchTransaction(callsPayload) : await AA.sendTransaction(callsPayload[0]);
-  const txHash = receipt.transactionHash;
-  const providerPrefix = AA.provider.toLowerCase();
-  return {
-    txHash,
-    txHashes: [txHash],
-    executionKind: `${providerPrefix}_${AA.mode}`,
-    batched: callList.length > 1,
-    sponsored: plan.sponsorship !== "disabled",
-    AAAddress: AA.AAAddress,
-    delegationAddress: AA.mode === "7702" ? AA.delegationAddress : void 0
-  };
 }
-async function executeViaEoa({
-  callList,
-  currentChainId,
-  capabilities,
-  localPrivateKey,
-  sendCallsSyncAsync,
-  sendTransactionAsync,
-  switchChainAsync,
-  chainsById,
-  getPreferredRpcUrl: getPreferredRpcUrl2
-}) {
-  var _a3, _b;
-  const { createPublicClient, createWalletClient: createWalletClient2, http: http2 } = await import("viem");
-  const { privateKeyToAccount: privateKeyToAccount3 } = await import("viem/accounts");
-  const hashes = [];
-  if (localPrivateKey) {
-    for (const call of callList) {
-      const chain = chainsById[call.chainId];
-      if (!chain) {
-        throw new Error(`Unsupported chain ${call.chainId}`);
+
+// src/cli/commands/history.ts
+async function logCommand(runtime) {
+  var _a3, _b, _c, _d, _e;
+  if (!readState()) {
+    console.log("No active session");
+    printDataFileLocation();
+    return;
+  }
+  const { session, state } = getOrCreateSession(runtime);
+  try {
+    const apiState = await session.client.fetchState(state.sessionId);
+    const messages = (_a3 = apiState.messages) != null ? _a3 : [];
+    const pendingTxs = (_b = state.pendingTxs) != null ? _b : [];
+    const signedTxs = (_c = state.signedTxs) != null ? _c : [];
+    const toolCalls = messages.filter((msg) => Boolean(msg.tool_result)).length;
+    const tokenCountEstimate = estimateTokenCount(messages);
+    const topic = (_d = apiState.title) != null ? _d : "Untitled Session";
+    if (messages.length === 0) {
+      console.log("No messages in this session.");
+      printDataFileLocation();
+      return;
+    }
+    console.log(`------ Session id: ${state.sessionId} ------`);
+    printKeyValueTable([
+      ["topic", topic],
+      ["msg count", String(messages.length)],
+      ["token count", `${tokenCountEstimate} (estimated)`],
+      ["tool calls", String(toolCalls)],
+      [
+        "transactions",
+        `${pendingTxs.length + signedTxs.length} (${pendingTxs.length} pending, ${signedTxs.length} signed)`
+      ]
+    ]);
+    console.log("Transactions metadata (JSON):");
+    printTransactionTable(pendingTxs, signedTxs);
+    console.log("-------------------- Messages --------------------");
+    for (const msg of messages) {
+      const content = formatLogContent(msg.content);
+      let time = "";
+      if (msg.timestamp) {
+        const raw = msg.timestamp;
+        const numeric = /^\d+$/.test(raw) ? parseInt(raw, 10) : NaN;
+        const date = !Number.isNaN(numeric) ? new Date(numeric < 1e12 ? numeric * 1e3 : numeric) : new Date(raw);
+        time = Number.isNaN(date.getTime()) ? "" : `${DIM}${date.toLocaleTimeString()}${RESET} `;
       }
-      const rpcUrl = getPreferredRpcUrl2(chain);
-      if (!rpcUrl) {
-        throw new Error(`No RPC for chain ${call.chainId}`);
+      const sender = (_e = msg.sender) != null ? _e : "unknown";
+      if (sender === "user") {
+        if (content) {
+          console.log(`${time}${CYAN}\u{1F464} You:${RESET} ${content}`);
+        }
+      } else if (sender === "agent" || sender === "assistant") {
+        if (msg.tool_result) {
+          const [toolName, result] = msg.tool_result;
+          console.log(
+            `${time}${GREEN}\u{1F527} [${toolName}]${RESET} ${formatToolResultPreview(result)}`
+          );
+        }
+        if (content) {
+          console.log(`${time}${CYAN}\u{1F916} Agent:${RESET} ${content}`);
+        }
+      } else if (sender === "system") {
+        if (content && !content.startsWith("Response of system endpoint:")) {
+          console.log(`${time}${YELLOW}\u2699\uFE0F  System:${RESET} ${content}`);
+        }
+      } else {
+        if (content) {
+          console.log(`${time}${DIM}[${sender}]${RESET} ${content}`);
+        }
       }
-      const account = privateKeyToAccount3(localPrivateKey);
-      const walletClient = createWalletClient2({
-        account,
-        chain,
-        transport: http2(rpcUrl)
-      });
-      const hash = await walletClient.sendTransaction({
-        account,
-        to: call.to,
-        value: BigInt(call.value),
-        data: call.data ? call.data : void 0
-      });
-      const publicClient = createPublicClient({
-        chain,
-        transport: http2(rpcUrl)
-      });
-      await publicClient.waitForTransactionReceipt({ hash });
-      hashes.push(hash);
     }
+    console.log(`
+${DIM}\u2014 ${messages.length} messages \u2014${RESET}`);
+    printDataFileLocation();
+  } finally {
+    session.close();
+  }
+}
+function closeCommand(runtime) {
+  if (readState()) {
+    const { session } = getOrCreateSession(runtime);
+    session.close();
+  }
+  clearState();
+  console.log("Session closed");
+}
+
+// src/cli/commands/sessions.ts
+async function fetchRemoteSessionStats(record) {
+  var _a3, _b;
+  const client = new AomiClient({
+    baseUrl: record.state.baseUrl,
+    apiKey: record.state.apiKey
+  });
+  try {
+    const apiState = await client.fetchState(record.sessionId);
+    const messages = (_a3 = apiState.messages) != null ? _a3 : [];
     return {
-      txHash: hashes[hashes.length - 1],
-      txHashes: hashes,
-      executionKind: "eoa",
-      batched: hashes.length > 1,
-      sponsored: false
+      topic: (_b = apiState.title) != null ? _b : "Untitled Session",
+      messageCount: messages.length,
+      tokenCountEstimate: estimateTokenCount(messages),
+      toolCalls: messages.filter((msg) => Boolean(msg.tool_result)).length
     };
+  } catch (e) {
+    return null;
   }
-  const chainIds = Array.from(new Set(callList.map((call) => call.chainId)));
-  if (chainIds.length > 1) {
-    throw new Error("mixed_chain_bundle_not_supported");
+}
+function printSessionSummary(record, stats, isActive) {
+  var _a3, _b, _c;
+  const pendingTxs = (_a3 = record.state.pendingTxs) != null ? _a3 : [];
+  const signedTxs = (_b = record.state.signedTxs) != null ? _b : [];
+  const header = isActive ? `\u{1F9F5} Session id: ${record.sessionId} (session-${record.localId}, active)` : `\u{1F9F5} Session id: ${record.sessionId} (session-${record.localId})`;
+  console.log(`${YELLOW}------ ${header} ------${RESET}`);
+  printKeyValueTable([
+    ["\u{1F9E0} topic", (_c = stats == null ? void 0 : stats.topic) != null ? _c : "Unavailable (fetch failed)"],
+    ["\u{1F4AC} msg count", stats ? String(stats.messageCount) : "n/a"],
+    [
+      "\u{1F9EE} token count",
+      stats ? `${stats.tokenCountEstimate} (estimated)` : "n/a"
+    ],
+    ["\u{1F6E0} tool calls", stats ? String(stats.toolCalls) : "n/a"],
+    [
+      "\u{1F4B8} transactions",
+      `${pendingTxs.length + signedTxs.length} (${pendingTxs.length} pending, ${signedTxs.length} signed)`
+    ]
+  ]);
+  console.log();
+  console.log(`${YELLOW}\u{1F4BE} Transactions metadata (JSON):${RESET}`);
+  printTransactionTable(pendingTxs, signedTxs);
+}
+async function sessionsCommand(_runtime) {
+  var _a3;
+  const sessions = listStoredSessions().sort((a, b) => b.updatedAt - a.updatedAt);
+  if (sessions.length === 0) {
+    console.log("No local sessions.");
+    printDataFileLocation();
+    return;
   }
-  const chainId = chainIds[0];
-  if (currentChainId !== chainId) {
-    await switchChainAsync({ chainId });
+  const activeSessionId = (_a3 = readState()) == null ? void 0 : _a3.sessionId;
+  const statsResults = await Promise.all(
+    sessions.map((record) => fetchRemoteSessionStats(record))
+  );
+  for (let i = 0; i < sessions.length; i++) {
+    printSessionSummary(
+      sessions[i],
+      statsResults[i],
+      sessions[i].sessionId === activeSessionId
+    );
+    if (i < sessions.length - 1) {
+      console.log();
+    }
   }
-  const chainCaps = capabilities == null ? void 0 : capabilities[`eip155:${chainId}`];
-  const atomicStatus = (_a3 = chainCaps == null ? void 0 : chainCaps.atomic) == null ? void 0 : _a3.status;
-  const canUseSendCalls = atomicStatus === "supported" || atomicStatus === "ready";
-  if (canUseSendCalls) {
-    const batchResult = await sendCallsSyncAsync({
-      calls: callList.map(mapCall),
-      capabilities: {
-        atomic: {
-          required: true
-        }
-      }
-    });
-    const receipts = (_b = batchResult.receipts) != null ? _b : [];
-    for (const receipt of receipts) {
-      if (receipt.transactionHash) {
-        hashes.push(receipt.transactionHash);
-      }
+  printDataFileLocation();
+}
+async function sessionCommand(runtime) {
+  const subcommand = runtime.parsed.positional[0];
+  const selector = runtime.parsed.positional[1];
+  if (subcommand === "resume") {
+    if (!selector) {
+      fatal("Usage: aomi session resume <session-id|session-N|N>");
     }
-  } else {
-    for (const call of callList) {
-      const hash = await sendTransactionAsync({
-        chainId: call.chainId,
-        to: call.to,
-        value: BigInt(call.value),
-        data: call.data ? call.data : void 0
-      });
-      hashes.push(hash);
+    const resumed = setActiveSession(selector);
+    if (!resumed) {
+      fatal(`No local session found for selector "${selector}".`);
     }
+    console.log(`Active session set to ${resumed.sessionId} (session-${resumed.localId}).`);
+    printDataFileLocation();
+    return;
   }
-  return {
-    txHash: hashes[hashes.length - 1],
-    txHashes: hashes,
-    executionKind: "eoa",
-    batched: hashes.length > 1,
-    sponsored: false
-  };
+  if (subcommand === "delete") {
+    if (!selector) {
+      fatal("Usage: aomi session delete <session-id|session-N|N>");
+    }
+    const deleted = deleteStoredSession(selector);
+    if (!deleted) {
+      fatal(`No local session found for selector "${selector}".`);
+    }
+    console.log(`Deleted local session ${deleted.sessionId} (session-${deleted.localId}).`);
+    const active = readState();
+    if (active) {
+      console.log(`Active session: ${active.sessionId}`);
+    } else {
+      console.log("No active session");
+    }
+    printDataFileLocation();
+    return;
+  }
+  if (subcommand === "list") {
+    await sessionsCommand(runtime);
+    return;
+  }
+  fatal(
+    "Usage: aomi session list\n       aomi session resume <session-id|session-N|N>\n       aomi session delete <session-id|session-N|N>"
+  );
 }
 
+// src/cli/commands/wallet.ts
+import { createWalletClient, http } from "viem";
+import { privateKeyToAccount as privateKeyToAccount2 } from "viem/accounts";
+import * as viemChains from "viem/chains";
+
 // src/aa/env.ts
 var ALCHEMY_API_KEY_ENVS = [
   "ALCHEMY_API_KEY",
@@ -2775,28 +2876,50 @@ async function createAAProviderState(options) {
     apiKey: options.apiKey
   });
 }
-function getOwnerParams(owner) {
-  if (!owner) {
-    return null;
-  }
-  if ("privateKey" in owner) {
-    return {
+function getDirectOwnerParams(owner) {
+  return {
+    kind: "ready",
+    ownerParams: {
       para: void 0,
       signer: privateKeyToAccount(owner.privateKey)
+    }
+  };
+}
+function getParaSessionOwnerParams(owner) {
+  if (owner.signer) {
+    return {
+      kind: "ready",
+      ownerParams: __spreadValues({
+        para: owner.session,
+        signer: owner.signer
+      }, owner.address ? { address: owner.address } : {})
     };
   }
-  if ("signer" in owner) {
-    return __spreadValues({
-      para: owner.para,
-      signer: owner.signer
-    }, owner.address ? { address: owner.address } : {});
+  return {
+    kind: "ready",
+    ownerParams: __spreadValues({
+      para: owner.session
+    }, owner.address ? { address: owner.address } : {})
+  };
+}
+function getSessionOwnerParams(owner) {
+  switch (owner.adapter) {
+    case "para":
+      return getParaSessionOwnerParams(owner);
+    default:
+      return { kind: "unsupported_adapter", adapter: owner.adapter };
   }
-  if ("para" in owner) {
-    return __spreadValues({
-      para: owner.para
-    }, owner.address ? { address: owner.address } : {});
+}
+function getOwnerParams(owner) {
+  if (!owner) {
+    return { kind: "missing" };
+  }
+  switch (owner.kind) {
+    case "direct":
+      return getDirectOwnerParams(owner);
+    case "session":
+      return getSessionOwnerParams(owner);
   }
-  return null;
 }
 function getMissingOwnerState(plan, provider) {
   return {
@@ -2804,10 +2927,18 @@ function getMissingOwnerState(plan, provider) {
     AA: null,
     isPending: false,
     error: new Error(
-      `${provider} AA account creation requires a signer or Para session.`
+      `${provider} AA account creation requires a direct owner or a supported session owner.`
     )
   };
 }
+function getUnsupportedAdapterState(plan, adapter) {
+  return {
+    plan,
+    AA: null,
+    isPending: false,
+    error: new Error(`Session adapter "${adapter}" is not implemented.`)
+  };
+}
 async function createAlchemyAAState(options) {
   var _a3, _b;
   const {
@@ -2837,11 +2968,14 @@ async function createAlchemyAAState(options) {
     fallbackToEoa: false
   });
   const ownerParams = getOwnerParams(owner);
-  if (!ownerParams) {
+  if (ownerParams.kind === "missing") {
     return getMissingOwnerState(plan, "alchemy");
   }
+  if (ownerParams.kind === "unsupported_adapter") {
+    return getUnsupportedAdapterState(plan, ownerParams.adapter);
+  }
   try {
-    const smartAccount = await createAlchemySmartAccount(__spreadProps(__spreadValues({}, ownerParams), {
+    const smartAccount = await createAlchemySmartAccount(__spreadProps(__spreadValues({}, ownerParams.ownerParams), {
       apiKey,
       gasPolicyId,
       chain,
@@ -2896,11 +3030,14 @@ async function createPimlicoAAState(options) {
     fallbackToEoa: false
   });
   const ownerParams = getOwnerParams(owner);
-  if (!ownerParams) {
+  if (ownerParams.kind === "missing") {
     return getMissingOwnerState(plan, "pimlico");
   }
+  if (ownerParams.kind === "unsupported_adapter") {
+    return getUnsupportedAdapterState(plan, ownerParams.adapter);
+  }
   try {
-    const smartAccount = await createPimlicoSmartAccount(__spreadProps(__spreadValues({}, ownerParams), {
+    const smartAccount = await createPimlicoSmartAccount(__spreadProps(__spreadValues({}, ownerParams.ownerParams), {
       apiKey,
       chain,
       rpcUrl,
@@ -2931,23 +3068,31 @@ async function createPimlicoAAState(options) {
 }
 
 // src/cli/execution.ts
-function resolveAAProvider(config) {
-  var _a3;
-  const provider = (_a3 = config.aaProvider) != null ? _a3 : resolveDefaultProvider();
-  if (!isProviderConfigured(provider)) {
+function resolveAAProvider(config, options) {
+  const provider = config.aaProvider;
+  if (provider) {
+    if (isProviderConfigured(provider)) {
+      return provider;
+    }
+    if (!options.required) {
+      return null;
+    }
     const envName = provider === "alchemy" ? "ALCHEMY_API_KEY" : "PIMLICO_API_KEY";
     throw new Error(
       `AA provider "${provider}" is selected but ${envName} is not configured.`
     );
   }
-  return provider;
-}
-function resolveCliExecutionDecision(params) {
-  const { config, chain, callList } = params;
-  if (config.execution === "eoa") {
-    return { execution: "eoa" };
+  try {
+    return resolveDefaultProvider();
+  } catch (error) {
+    if (!options.required) {
+      return null;
+    }
+    throw error;
   }
-  const provider = resolveAAProvider(config);
+}
+function getResolvedAAMode(params) {
+  const { provider, config, chain, callList, fallbackToEoa } = params;
   const resolveOpts = {
     calls: callList,
     chainsById: { [chain.id]: chain },
@@ -2961,9 +3106,35 @@ function resolveCliExecutionDecision(params) {
   return {
     execution: "aa",
     provider,
-    aaMode: resolved.plan.mode
+    aaMode: resolved.plan.mode,
+    fallbackToEoa
   };
 }
+function resolveCliExecutionDecision(params) {
+  const { config, chain, callList } = params;
+  if (config.execution === "eoa") {
+    return { execution: "eoa" };
+  }
+  const requireAA = config.execution === "aa";
+  const provider = resolveAAProvider(config, { required: requireAA });
+  if (!provider) {
+    return { execution: "eoa" };
+  }
+  try {
+    return getResolvedAAMode({
+      provider,
+      config,
+      chain,
+      callList,
+      fallbackToEoa: !requireAA
+    });
+  } catch (error) {
+    if (!requireAA) {
+      return { execution: "eoa" };
+    }
+    throw error;
+  }
+}
 async function createCliProviderState(params) {
   const { decision, chain, privateKey, rpcUrl, callList, sponsored } = params;
   if (decision.execution === "eoa") {
@@ -2972,7 +3143,7 @@ async function createCliProviderState(params) {
   return createAAProviderState({
     provider: decision.provider,
     chain,
-    owner: { privateKey },
+    owner: { kind: "direct", privateKey },
     rpcUrl,
     callList,
     mode: decision.aaMode,
@@ -2983,7 +3154,7 @@ function describeExecutionDecision(decision) {
   if (decision.execution === "eoa") {
     return "eoa";
   }
-  return `aa (${decision.provider}, ${decision.aaMode})`;
+  return decision.fallbackToEoa ? `aa (${decision.provider}, ${decision.aaMode}; fallback: eoa)` : `aa (${decision.provider}, ${decision.aaMode})`;
 }
 
 // src/cli/commands/wallet.ts
@@ -3067,8 +3238,9 @@ function createSessionFromState(state) {
       publicKey: state.publicKey
     }
   );
-  if (state.publicKey) {
-    session.resolveWallet(state.publicKey, state.chainId);
+  const userState = buildCliUserState(state.publicKey, state.chainId);
+  if (userState) {
+    session.resolveUserState(userState);
   }
   return session;
 }
@@ -3101,24 +3273,6 @@ function getPreferredRpcUrl(chain, override) {
   var _a3, _b, _c;
   return (_c = (_b = override != null ? override : chain.rpcUrls.default.http[0]) != null ? _b : (_a3 = chain.rpcUrls.public) == null ? void 0 : _a3.http[0]) != null ? _c : "";
 }
-async function promptForEoaFallback() {
-  if (!process.stdin.isTTY || !process.stdout.isTTY) {
-    return false;
-  }
-  const rl = createInterface({
-    input: process.stdin,
-    output: process.stdout
-  });
-  try {
-    const answer = await rl.question(
-      "Account abstraction not available, use EOA? [yes/no] "
-    );
-    const normalized = answer.trim().toLowerCase();
-    return normalized === "y" || normalized === "yes";
-  } finally {
-    rl.close();
-  }
-}
 async function executeCliTransaction(params) {
   const { privateKey, currentChainId, chainsById, rpcUrl, providerState, callList } = params;
   const unsupportedWalletMethod = async () => {
@@ -3194,11 +3348,12 @@ async function executeTransactionWithFallback(params) {
         error = retryError;
       }
     }
-    const useEoa = await promptForEoaFallback();
-    if (!useEoa) {
+    if (!decision.fallbackToEoa) {
       throw error;
     }
     const eoaDecision = { execution: "eoa" };
+    const errorMessage = error instanceof Error ? error.message : String(error);
+    console.log(`AA execution failed: ${errorMessage}`);
     console.log("Retrying with EOA execution...");
     const eoaProviderState = await createCliProviderState({
       decision: eoaDecision,
@@ -3414,16 +3569,19 @@ Usage:
   aomi chat --model <rig>
                         Set the session model before sending the message
   aomi chat --verbose   Stream agent responses, tool calls, and events live
-  aomi models           List models available to the current backend
+  aomi app list         List available apps
+  aomi app current      Show the current app
+  aomi model list       List models available to the current backend
   aomi model set <rig>  Set the active model for the current session
-  aomi sessions         List local sessions with metadata tables
+  aomi chain list       List supported chains
+  aomi session list     List local sessions with metadata
   aomi session resume <id>
                         Resume a local session (session-id or session-N)
   aomi session delete <id>
                         Delete a local session file (session-id or session-N)
   aomi log              Show full conversation history with tool results
   aomi tx               List pending and signed transactions
-  aomi sign <tx-id> [<tx-id> ...] [--aa | --eoa] [--aa-provider <name>] [--aa-mode <mode>]
+  aomi sign <tx-id> [<tx-id> ...] [--eoa | --aa] [--aa-provider <name>] [--aa-mode <mode>]
                         Sign and submit a pending transaction
   aomi status           Show current session state
   aomi events           List system events
@@ -3440,15 +3598,20 @@ Options:
   --verbose, -v         Show tool calls and streaming output (for chat)
 
 Sign options:
-  aomi sign <tx-id> --aa
-                        Require account-abstraction execution (default)
   aomi sign <tx-id> --eoa
                         Force plain EOA execution
+  aomi sign <tx-id> --aa
+                        Require account-abstraction execution with no EOA fallback
   aomi sign <tx-id> --aa-provider <name>
                         AA provider: alchemy | pimlico
   aomi sign <tx-id> --aa-mode <mode>
                         AA mode: 4337 | 7702
 
+Default signing behavior:
+  aomi sign <tx-id>
+                        Try AA first, retry unsponsored AA when supported, then
+                        fall back to EOA automatically if AA is unavailable
+
 Environment (overridden by flags):
   AOMI_BASE_URL         Backend URL
   AOMI_API_KEY          API key
@@ -3475,17 +3638,17 @@ async function main(runtime) {
     case "log":
       await logCommand(runtime);
       break;
-    case "models":
-      await modelsCommand(runtime);
+    case "app":
+      await appCommand(runtime);
       break;
     case "model":
       await modelCommand(runtime);
       break;
-    case "sessions":
-      await sessionsCommand(runtime);
+    case "chain":
+      chainCommand(runtime);
       break;
     case "session":
-      sessionCommand(runtime);
+      await sessionCommand(runtime);
       break;
     case "tx":
       txCommand();