@aomi-labs/client 0.1.1 → 0.1.5

package/dist/cli.js

@@ -19,6 +19,494 @@ var __spreadValues = (a, b) => {
 };
 var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 
+// src/cli/errors.ts
+var CliExit = class extends Error {
+  constructor(code) {
+    super();
+    this.code = code;
+  }
+};
+function fatal(message) {
+  const RED = "\x1B[31m";
+  const DIM3 = "\x1B[2m";
+  const RESET3 = "\x1B[0m";
+  const lines = message.split("\n");
+  const [headline, ...details] = lines;
+  console.error(`${RED}\u274C ${headline}${RESET3}`);
+  for (const detail of details) {
+    if (!detail.trim()) {
+      console.error("");
+      continue;
+    }
+    console.error(`${DIM3}${detail}${RESET3}`);
+  }
+  throw new CliExit(1);
+}
+
+// src/cli/args.ts
+var SUPPORTED_CHAIN_IDS = [1, 137, 42161, 8453, 10, 11155111];
+var CHAIN_NAMES = {
+  1: "Ethereum",
+  137: "Polygon",
+  42161: "Arbitrum One",
+  8453: "Base",
+  10: "Optimism",
+  11155111: "Sepolia"
+};
+function parseChainId(value) {
+  if (value === void 0) return void 0;
+  const n = parseInt(value, 10);
+  if (Number.isNaN(n)) return void 0;
+  if (!SUPPORTED_CHAIN_IDS.includes(n)) {
+    const list = SUPPORTED_CHAIN_IDS.map(
+      (id) => `  ${id} (${CHAIN_NAMES[id]})`
+    ).join("\n");
+    fatal(`Unsupported chain ID: ${n}
+Supported chains:
+${list}`);
+  }
+  return n;
+}
+function parseArgs(argv) {
+  const raw = argv.slice(2);
+  const command = raw[0] && !raw[0].startsWith("--") ? raw[0] : void 0;
+  const rest = command ? raw.slice(1) : raw;
+  const positional = [];
+  const flags = {};
+  for (let i = 0; i < rest.length; i++) {
+    const arg = rest[i];
+    if (arg.startsWith("--") && arg.includes("=")) {
+      const [key, ...val] = arg.slice(2).split("=");
+      flags[key] = val.join("=");
+    } else if (arg.startsWith("--")) {
+      const key = arg.slice(2);
+      const next = rest[i + 1];
+      if (next && !next.startsWith("-")) {
+        flags[key] = next;
+        i++;
+      } else {
+        flags[key] = "true";
+      }
+    } else if (arg.startsWith("-") && arg.length === 2) {
+      flags[arg.slice(1)] = "true";
+    } else {
+      positional.push(arg);
+    }
+  }
+  return { command, positional, flags };
+}
+function getConfig(parsed) {
+  var _a3, _b, _c, _d, _e, _f, _g, _h, _i, _j;
+  return {
+    baseUrl: (_b = (_a3 = parsed.flags["backend-url"]) != null ? _a3 : process.env.AOMI_BASE_URL) != null ? _b : "https://api.aomi.dev",
+    apiKey: (_c = parsed.flags["api-key"]) != null ? _c : process.env.AOMI_API_KEY,
+    app: (_e = (_d = parsed.flags["app"]) != null ? _d : process.env.AOMI_APP) != null ? _e : "default",
+    model: (_f = parsed.flags["model"]) != null ? _f : process.env.AOMI_MODEL,
+    publicKey: (_g = parsed.flags["public-key"]) != null ? _g : process.env.AOMI_PUBLIC_KEY,
+    privateKey: (_h = parsed.flags["private-key"]) != null ? _h : process.env.PRIVATE_KEY,
+    chainRpcUrl: (_i = parsed.flags["rpc-url"]) != null ? _i : process.env.CHAIN_RPC_URL,
+    chain: parseChainId((_j = parsed.flags["chain"]) != null ? _j : process.env.AOMI_CHAIN_ID)
+  };
+}
+function createRuntime(argv) {
+  const parsed = parseArgs(argv);
+  return {
+    parsed,
+    config: getConfig(parsed)
+  };
+}
+
+// src/cli/state.ts
+import {
+  existsSync,
+  mkdirSync,
+  readFileSync,
+  readdirSync,
+  rmSync,
+  writeFileSync
+} from "fs";
+import { basename, join } from "path";
+import { homedir, tmpdir } from "os";
+var SESSION_FILE_PREFIX = "session-";
+var SESSION_FILE_SUFFIX = ".json";
+var _a;
+var LEGACY_STATE_FILE = join(
+  (_a = process.env.XDG_RUNTIME_DIR) != null ? _a : tmpdir(),
+  "aomi-session.json"
+);
+var _a2;
+var STATE_ROOT_DIR = (_a2 = process.env.AOMI_STATE_DIR) != null ? _a2 : join(homedir(), ".aomi");
+var SESSIONS_DIR = join(STATE_ROOT_DIR, "sessions");
+var ACTIVE_SESSION_FILE = join(STATE_ROOT_DIR, "active-session.txt");
+function ensureStorageDirs() {
+  mkdirSync(SESSIONS_DIR, { recursive: true });
+}
+function parseSessionFileLocalId(filename) {
+  const match = filename.match(/^session-(\d+)\.json$/);
+  if (!match) return null;
+  const localId = parseInt(match[1], 10);
+  return Number.isNaN(localId) ? null : localId;
+}
+function toSessionFilePath(localId) {
+  return join(SESSIONS_DIR, `${SESSION_FILE_PREFIX}${localId}${SESSION_FILE_SUFFIX}`);
+}
+function toCliSessionState(stored) {
+  return {
+    sessionId: stored.sessionId,
+    baseUrl: stored.baseUrl,
+    app: stored.app,
+    model: stored.model,
+    apiKey: stored.apiKey,
+    publicKey: stored.publicKey,
+    chainId: stored.chainId,
+    pendingTxs: stored.pendingTxs,
+    signedTxs: stored.signedTxs
+  };
+}
+function readStoredSession(path) {
+  var _a3;
+  try {
+    const raw = readFileSync(path, "utf-8");
+    const parsed = JSON.parse(raw);
+    if (typeof parsed.sessionId !== "string" || typeof parsed.baseUrl !== "string") {
+      return null;
+    }
+    const fallbackLocalId = (_a3 = parseSessionFileLocalId(basename(path))) != null ? _a3 : 0;
+    return {
+      sessionId: parsed.sessionId,
+      baseUrl: parsed.baseUrl,
+      app: parsed.app,
+      model: parsed.model,
+      apiKey: parsed.apiKey,
+      publicKey: parsed.publicKey,
+      chainId: parsed.chainId,
+      pendingTxs: parsed.pendingTxs,
+      signedTxs: parsed.signedTxs,
+      localId: typeof parsed.localId === "number" && parsed.localId > 0 ? parsed.localId : fallbackLocalId,
+      createdAt: typeof parsed.createdAt === "number" && parsed.createdAt > 0 ? parsed.createdAt : Date.now(),
+      updatedAt: typeof parsed.updatedAt === "number" && parsed.updatedAt > 0 ? parsed.updatedAt : Date.now()
+    };
+  } catch (e) {
+    return null;
+  }
+}
+function readActiveLocalId() {
+  try {
+    if (!existsSync(ACTIVE_SESSION_FILE)) return null;
+    const raw = readFileSync(ACTIVE_SESSION_FILE, "utf-8").trim();
+    if (!raw) return null;
+    const parsed = parseInt(raw, 10);
+    return Number.isNaN(parsed) ? null : parsed;
+  } catch (e) {
+    return null;
+  }
+}
+function writeActiveLocalId(localId) {
+  try {
+    if (localId === null) {
+      if (existsSync(ACTIVE_SESSION_FILE)) {
+        rmSync(ACTIVE_SESSION_FILE);
+      }
+      return;
+    }
+    ensureStorageDirs();
+    writeFileSync(ACTIVE_SESSION_FILE, String(localId));
+  } catch (e) {
+  }
+}
+function readAllStoredSessions() {
+  try {
+    ensureStorageDirs();
+    const filenames = readdirSync(SESSIONS_DIR).map((name) => ({ name, localId: parseSessionFileLocalId(name) })).filter(
+      (entry) => entry.localId !== null
+    ).sort((a, b) => a.localId - b.localId);
+    const sessions = [];
+    for (const entry of filenames) {
+      const path = join(SESSIONS_DIR, entry.name);
+      const stored = readStoredSession(path);
+      if (stored) {
+        sessions.push(stored);
+      }
+    }
+    return sessions;
+  } catch (e) {
+    return [];
+  }
+}
+function getNextLocalId(sessions) {
+  const maxLocalId = sessions.reduce((max, session) => {
+    return session.localId > max ? session.localId : max;
+  }, 0);
+  return maxLocalId + 1;
+}
+var _migrationDone = false;
+function migrateLegacyStateIfNeeded() {
+  if (_migrationDone) return;
+  _migrationDone = true;
+  if (!existsSync(LEGACY_STATE_FILE)) return;
+  const existing = readAllStoredSessions();
+  if (existing.length > 0) {
+    return;
+  }
+  try {
+    const raw = readFileSync(LEGACY_STATE_FILE, "utf-8");
+    const legacy = JSON.parse(raw);
+    if (!legacy.sessionId || !legacy.baseUrl) {
+      return;
+    }
+    const now = Date.now();
+    const migrated = __spreadProps(__spreadValues({}, legacy), {
+      localId: 1,
+      createdAt: now,
+      updatedAt: now
+    });
+    ensureStorageDirs();
+    writeFileSync(toSessionFilePath(1), JSON.stringify(migrated, null, 2));
+    writeActiveLocalId(1);
+    rmSync(LEGACY_STATE_FILE);
+  } catch (e) {
+  }
+}
+function resolveStoredSession(selector, sessions) {
+  var _a3, _b;
+  const trimmed = selector.trim();
+  if (!trimmed) return null;
+  const localMatch = trimmed.match(/^(?:session-)?(\d+)$/);
+  if (localMatch) {
+    const localId = parseInt(localMatch[1], 10);
+    if (!Number.isNaN(localId)) {
+      return (_a3 = sessions.find((session) => session.localId === localId)) != null ? _a3 : null;
+    }
+  }
+  return (_b = sessions.find((session) => session.sessionId === trimmed)) != null ? _b : null;
+}
+function toStoredSessionRecord(stored) {
+  return {
+    localId: stored.localId,
+    sessionId: stored.sessionId,
+    path: toSessionFilePath(stored.localId),
+    createdAt: stored.createdAt,
+    updatedAt: stored.updatedAt,
+    state: toCliSessionState(stored)
+  };
+}
+function getActiveStateFilePath() {
+  migrateLegacyStateIfNeeded();
+  const sessions = readAllStoredSessions();
+  const activeLocalId = readActiveLocalId();
+  if (activeLocalId === null) return null;
+  const active = sessions.find((session) => session.localId === activeLocalId);
+  return active ? toSessionFilePath(active.localId) : null;
+}
+function listStoredSessions() {
+  migrateLegacyStateIfNeeded();
+  return readAllStoredSessions().map(toStoredSessionRecord);
+}
+function setActiveSession(selector) {
+  migrateLegacyStateIfNeeded();
+  const sessions = readAllStoredSessions();
+  const target = resolveStoredSession(selector, sessions);
+  if (!target) return null;
+  writeActiveLocalId(target.localId);
+  return toStoredSessionRecord(target);
+}
+function deleteStoredSession(selector) {
+  var _a3, _b;
+  migrateLegacyStateIfNeeded();
+  const sessions = readAllStoredSessions();
+  const target = resolveStoredSession(selector, sessions);
+  if (!target) return null;
+  const targetPath = toSessionFilePath(target.localId);
+  try {
+    if (existsSync(targetPath)) {
+      rmSync(targetPath);
+    }
+  } catch (e) {
+    return null;
+  }
+  const activeLocalId = readActiveLocalId();
+  if (activeLocalId === target.localId) {
+    const remaining = readAllStoredSessions().sort((a, b) => b.updatedAt - a.updatedAt);
+    writeActiveLocalId((_b = (_a3 = remaining[0]) == null ? void 0 : _a3.localId) != null ? _b : null);
+  }
+  return toStoredSessionRecord(target);
+}
+function readState() {
+  var _a3;
+  migrateLegacyStateIfNeeded();
+  const sessions = readAllStoredSessions();
+  if (sessions.length === 0) return null;
+  const activeLocalId = readActiveLocalId();
+  if (activeLocalId === null) {
+    return null;
+  }
+  const active = (_a3 = sessions.find((session) => session.localId === activeLocalId)) != null ? _a3 : null;
+  if (!active) {
+    writeActiveLocalId(null);
+    return null;
+  }
+  return toCliSessionState(active);
+}
+function writeState(state) {
+  var _a3, _b;
+  migrateLegacyStateIfNeeded();
+  ensureStorageDirs();
+  const sessions = readAllStoredSessions();
+  const activeLocalId = readActiveLocalId();
+  const existingBySessionId = sessions.find(
+    (session) => session.sessionId === state.sessionId
+  );
+  const existingByActive = activeLocalId !== null ? sessions.find((session) => session.localId === activeLocalId) : void 0;
+  const existing = existingBySessionId != null ? existingBySessionId : existingByActive;
+  const now = Date.now();
+  const localId = (_a3 = existing == null ? void 0 : existing.localId) != null ? _a3 : getNextLocalId(sessions);
+  const createdAt = (_b = existing == null ? void 0 : existing.createdAt) != null ? _b : now;
+  const payload = __spreadProps(__spreadValues({}, state), {
+    localId,
+    createdAt,
+    updatedAt: now
+  });
+  writeFileSync(toSessionFilePath(localId), JSON.stringify(payload, null, 2));
+  writeActiveLocalId(localId);
+}
+function clearState() {
+  migrateLegacyStateIfNeeded();
+  writeActiveLocalId(null);
+}
+function getNextTxId(state) {
+  var _a3, _b;
+  const allIds = [...(_a3 = state.pendingTxs) != null ? _a3 : [], ...(_b = state.signedTxs) != null ? _b : []].map((tx) => {
+    const match = tx.id.match(/^tx-(\d+)$/);
+    return match ? parseInt(match[1], 10) : 0;
+  });
+  const max = allIds.length > 0 ? Math.max(...allIds) : 0;
+  return `tx-${max + 1}`;
+}
+function addPendingTx(state, tx) {
+  if (!state.pendingTxs) state.pendingTxs = [];
+  const pending = __spreadProps(__spreadValues({}, tx), {
+    id: getNextTxId(state)
+  });
+  state.pendingTxs.push(pending);
+  writeState(state);
+  return pending;
+}
+function removePendingTx(state, id) {
+  if (!state.pendingTxs) return null;
+  const idx = state.pendingTxs.findIndex((tx) => tx.id === id);
+  if (idx === -1) return null;
+  const [removed] = state.pendingTxs.splice(idx, 1);
+  writeState(state);
+  return removed;
+}
+function addSignedTx(state, tx) {
+  if (!state.signedTxs) state.signedTxs = [];
+  state.signedTxs.push(tx);
+  writeState(state);
+}
+
+// src/cli/output.ts
+var DIM = "\x1B[2m";
+var CYAN = "\x1B[36m";
+var YELLOW = "\x1B[33m";
+var GREEN = "\x1B[32m";
+var RESET = "\x1B[0m";
+function printDataFileLocation() {
+  const activeFile = getActiveStateFilePath();
+  if (activeFile) {
+    console.log(`Data stored at ${activeFile} \u{1F4DD}`);
+    return;
+  }
+  console.log(`Data stored under ${STATE_ROOT_DIR} \u{1F4DD}`);
+}
+function printToolUpdate(event) {
+  var _a3;
+  const name = getToolNameFromEvent(event);
+  const status = (_a3 = event.status) != null ? _a3 : "running";
+  console.log(`${DIM}\u{1F527} [tool] ${name}: ${status}${RESET}`);
+}
+function printToolComplete(event) {
+  const name = getToolNameFromEvent(event);
+  const result = getToolResultFromEvent(event);
+  const line = formatToolResultLine(name, result);
+  console.log(line);
+}
+function printToolResultLine(name, result) {
+  console.log(formatToolResultLine(name, result));
+}
+function getToolNameFromEvent(event) {
+  var _a3, _b;
+  return (_b = (_a3 = event.tool_name) != null ? _a3 : event.name) != null ? _b : "unknown";
+}
+function getToolResultFromEvent(event) {
+  var _a3;
+  return (_a3 = event.result) != null ? _a3 : event.output;
+}
+function toToolResultKey(name, result) {
+  return `${name}
+${result != null ? result : ""}`;
+}
+function getMessageToolResults(messages, startAt = 0) {
+  const results = [];
+  for (let i = startAt; i < messages.length; i++) {
+    const toolResult = messages[i].tool_result;
+    if (!toolResult) {
+      continue;
+    }
+    const [name, result] = toolResult;
+    if (!name || typeof result !== "string") {
+      continue;
+    }
+    results.push({ name, result });
+  }
+  return results;
+}
+function isAlwaysVisibleTool(name) {
+  const normalized = name.toLowerCase();
+  if (normalized.includes("encode_and_simulate") || normalized.includes("encode-and-simulate") || normalized.includes("encode_and_view") || normalized.includes("encode-and-view")) {
+    return true;
+  }
+  if (normalized.startsWith("simulate ")) {
+    return true;
+  }
+  return false;
+}
+function printNewAgentMessages(messages, lastPrintedCount) {
+  const agentMessages = messages.filter(
+    (message) => message.sender === "agent" || message.sender === "assistant"
+  );
+  let handled = lastPrintedCount;
+  for (let i = lastPrintedCount; i < agentMessages.length; i++) {
+    const message = agentMessages[i];
+    if (message.is_streaming) {
+      break;
+    }
+    if (message.content) {
+      console.log(`${CYAN}\u{1F916} ${message.content}${RESET}`);
+    }
+    handled = i + 1;
+  }
+  return handled;
+}
+function formatLogContent(content) {
+  if (!content) return null;
+  const trimmed = content.trim();
+  return trimmed.length > 0 ? trimmed : null;
+}
+function formatToolResultPreview(result, maxLength = 200) {
+  const normalized = result.replace(/\s+/g, " ").trim();
+  if (normalized.length <= maxLength) {
+    return normalized;
+  }
+  return `${normalized.slice(0, maxLength)}\u2026`;
+}
+function formatToolResultLine(name, result) {
+  if (!result) {
+    return `${GREEN}\u2714 [tool] ${name} done${RESET}`;
+  }
+  return `${GREEN}\u2714 [tool] ${name} \u2192 ${formatToolResultPreview(result, 120)}${RESET}`;
+}
+
 // src/sse.ts
 function extractSseData(rawEvent) {
   const dataLines = rawEvent.split("\n").filter((line) => line.startsWith("data:")).map((line) => line.slice(5).trimStart());
@@ -86,13 +574,13 @@ function createSseSubscriber({
       stopped: false,
       listeners: /* @__PURE__ */ new Set([listener]),
       stop: (reason) => {
-        var _a2;
+        var _a3;
         subscription.stopped = true;
         if (subscription.retryTimer) {
           clearTimeout(subscription.retryTimer);
           subscription.retryTimer = null;
         }
-        (_a2 = subscription.abortController) == null ? void 0 : _a2.abort();
+        (_a3 = subscription.abortController) == null ? void 0 : _a3.abort();
         subscription.abortController = null;
         logger == null ? void 0 : logger.debug("[aomi][sse] stop", {
           sessionId,
@@ -115,7 +603,7 @@ function createSseSubscriber({
       }, delayMs);
     };
     const open = async () => {
-      var _a2;
+      var _a3;
       if (subscription.stopped) return;
       if (subscription.retryTimer) {
         clearTimeout(subscription.retryTimer);
@@ -139,19 +627,19 @@ function createSseSubscriber({
         }
         subscription.retries = 0;
         await readSseStream(response.body, controller.signal, (data) => {
-          var _a3, _b;
-          let parsed2;
+          var _a4, _b;
+          let parsed;
           try {
-            parsed2 = JSON.parse(data);
+            parsed = JSON.parse(data);
           } catch (error) {
             for (const item of subscription.listeners) {
-              (_a3 = item.onError) == null ? void 0 : _a3.call(item, error);
+              (_a4 = item.onError) == null ? void 0 : _a4.call(item, error);
             }
             return;
           }
           for (const item of subscription.listeners) {
             try {
-              item.onUpdate(parsed2);
+              item.onUpdate(parsed);
             } catch (error) {
               (_b = item.onError) == null ? void 0 : _b.call(item, error);
             }
@@ -166,7 +654,7 @@ function createSseSubscriber({
       } catch (error) {
         if (!controller.signal.aborted && !subscription.stopped) {
           for (const item of subscription.listeners) {
-            (_a2 = item.onError) == null ? void 0 : _a2.call(item, error);
+            (_a3 = item.onError) == null ? void 0 : _a3.call(item, error);
           }
         }
       }
@@ -260,10 +748,10 @@ var AomiClient = class {
    * Send a chat message and return updated session state.
    */
   async sendMessage(sessionId, message, options) {
-    var _a2, _b;
-    const namespace = (_a2 = options == null ? void 0 : options.namespace) != null ? _a2 : "default";
+    var _a3, _b;
+    const app = (_a3 = options == null ? void 0 : options.app) != null ? _a3 : "default";
     const apiKey = (_b = options == null ? void 0 : options.apiKey) != null ? _b : this.apiKey;
-    const payload = { message, namespace };
+    const payload = { message, app };
     if (options == null ? void 0 : options.publicKey) {
       payload.public_key = options.publicKey;
     }
@@ -436,32 +924,38 @@ var AomiClient = class {
   // Control API
   // ===========================================================================
   /**
-   * Get available namespaces.
+   * Get available apps.
    */
-  async getNamespaces(sessionId, options) {
-    var _a2;
-    const url = new URL("/api/control/namespaces", this.baseUrl);
+  async getApps(sessionId, options) {
+    var _a3;
+    const url = new URL("/api/control/apps", this.baseUrl);
     if (options == null ? void 0 : options.publicKey) {
       url.searchParams.set("public_key", options.publicKey);
     }
-    const apiKey = (_a2 = options == null ? void 0 : options.apiKey) != null ? _a2 : this.apiKey;
+    const apiKey = (_a3 = options == null ? void 0 : options.apiKey) != null ? _a3 : this.apiKey;
     const headers = new Headers(withSessionHeader(sessionId));
     if (apiKey) {
       headers.set(API_KEY_HEADER, apiKey);
     }
     const response = await fetch(url.toString(), { headers });
     if (!response.ok) {
-      throw new Error(`Failed to get namespaces: HTTP ${response.status}`);
+      throw new Error(`Failed to get apps: HTTP ${response.status}`);
     }
     return await response.json();
   }
   /**
    * Get available models.
    */
-  async getModels(sessionId) {
+  async getModels(sessionId, options) {
+    var _a3;
     const url = new URL("/api/control/models", this.baseUrl);
+    const apiKey = (_a3 = options == null ? void 0 : options.apiKey) != null ? _a3 : this.apiKey;
+    const headers = new Headers(withSessionHeader(sessionId));
+    if (apiKey) {
+      headers.set(API_KEY_HEADER, apiKey);
+    }
     const response = await fetch(url.toString(), {
-      headers: withSessionHeader(sessionId)
+      headers
     });
     if (!response.ok) {
       throw new Error(`Failed to get models: HTTP ${response.status}`);
@@ -472,11 +966,11 @@ var AomiClient = class {
    * Set the model for a session.
    */
   async setModel(sessionId, rig, options) {
-    var _a2;
-    const apiKey = (_a2 = options == null ? void 0 : options.apiKey) != null ? _a2 : this.apiKey;
+    var _a3;
+    const apiKey = (_a3 = options == null ? void 0 : options.apiKey) != null ? _a3 : this.apiKey;
     const payload = { rig };
-    if (options == null ? void 0 : options.namespace) {
-      payload.namespace = options.namespace;
+    if (options == null ? void 0 : options.app) {
+      payload.app = options.app;
     }
     return postState(this.baseUrl, "/api/control/model", payload, sessionId, apiKey);
   }
@@ -570,11 +1064,11 @@ function isAsyncCallback(event) {
 
 // src/event-unwrap.ts
 function unwrapSystemEvent(event) {
-  var _a2;
+  var _a3;
   if (isInlineCall(event)) {
     return {
       type: event.InlineCall.type,
-      payload: (_a2 = event.InlineCall.payload) != null ? _a2 : event.InlineCall
+      payload: (_a3 = event.InlineCall.payload) != null ? _a3 : event.InlineCall
     };
   }
   if (isSystemNotice(event)) {
@@ -605,12 +1099,12 @@ function asRecord(value) {
   return value;
 }
 function getToolArgs(payload) {
-  var _a2;
+  var _a3;
   const root = asRecord(payload);
   const nestedArgs = asRecord(root == null ? void 0 : root.args);
-  return (_a2 = nestedArgs != null ? nestedArgs : root) != null ? _a2 : {};
+  return (_a3 = nestedArgs != null ? nestedArgs : root) != null ? _a3 : {};
 }
-function parseChainId(value) {
+function parseChainId2(value) {
   if (typeof value === "number" && Number.isFinite(value)) return value;
   if (typeof value !== "string") return void 0;
   const trimmed = value.trim();
@@ -619,11 +1113,11 @@ function parseChainId(value) {
     const parsedHex = Number.parseInt(trimmed.slice(2), 16);
     return Number.isFinite(parsedHex) ? parsedHex : void 0;
   }
-  const parsed2 = Number.parseInt(trimmed, 10);
-  return Number.isFinite(parsed2) ? parsed2 : void 0;
+  const parsed = Number.parseInt(trimmed, 10);
+  return Number.isFinite(parsed) ? parsed : void 0;
 }
 function normalizeTxPayload(payload) {
-  var _a2, _b, _c;
+  var _a3, _b, _c;
   const root = asRecord(payload);
   const args = getToolArgs(payload);
   const ctx = asRecord(root == null ? void 0 : root.ctx);
@@ -632,19 +1126,19 @@ function normalizeTxPayload(payload) {
   const valueRaw = args.value;
   const value = typeof valueRaw === "string" ? valueRaw : typeof valueRaw === "number" && Number.isFinite(valueRaw) ? String(Math.trunc(valueRaw)) : void 0;
   const data = typeof args.data === "string" ? args.data : void 0;
-  const chainId = (_c = (_b = (_a2 = parseChainId(args.chainId)) != null ? _a2 : parseChainId(args.chain_id)) != null ? _b : parseChainId(ctx == null ? void 0 : ctx.user_chain_id)) != null ? _c : parseChainId(ctx == null ? void 0 : ctx.userChainId);
+  const chainId = (_c = (_b = (_a3 = parseChainId2(args.chainId)) != null ? _a3 : parseChainId2(args.chain_id)) != null ? _b : parseChainId2(ctx == null ? void 0 : ctx.user_chain_id)) != null ? _c : parseChainId2(ctx == null ? void 0 : ctx.userChainId);
   return { to, value, data, chainId };
 }
 function normalizeEip712Payload(payload) {
-  var _a2;
+  var _a3;
   const args = getToolArgs(payload);
-  const typedDataRaw = (_a2 = args.typed_data) != null ? _a2 : args.typedData;
+  const typedDataRaw = (_a3 = args.typed_data) != null ? _a3 : args.typedData;
   let typedData;
   if (typeof typedDataRaw === "string") {
     try {
-      const parsed2 = JSON.parse(typedDataRaw);
-      if (parsed2 && typeof parsed2 === "object" && !Array.isArray(parsed2)) {
-        typedData = parsed2;
+      const parsed = JSON.parse(typedDataRaw);
+      if (parsed && typeof parsed === "object" && !Array.isArray(parsed)) {
+        typedData = parsed;
       }
     } catch (e) {
       typedData = void 0;
@@ -657,9 +1151,40 @@ function normalizeEip712Payload(payload) {
 }
 
 // src/session.ts
-var Session = class extends TypedEventEmitter {
+function sortJson(value) {
+  if (Array.isArray(value)) {
+    return value.map((entry) => sortJson(entry));
+  }
+  if (value && typeof value === "object") {
+    return Object.keys(value).sort().reduce((acc, key) => {
+      acc[key] = sortJson(value[key]);
+      return acc;
+    }, {});
+  }
+  return value;
+}
+function isSubsetMatch(expected, actual) {
+  if (Array.isArray(expected)) {
+    if (!Array.isArray(actual) || expected.length !== actual.length) {
+      return false;
+    }
+    return expected.every(
+      (entry, index) => isSubsetMatch(entry, actual[index])
+    );
+  }
+  if (expected && typeof expected === "object") {
+    if (!actual || typeof actual !== "object" || Array.isArray(actual)) {
+      return false;
+    }
+    return Object.entries(expected).every(
+      ([key, value]) => isSubsetMatch(value, actual[key])
+    );
+  }
+  return expected === actual;
+}
+var ClientSession = class extends TypedEventEmitter {
   constructor(clientOrOptions, sessionOptions) {
-    var _a2, _b, _c;
+    var _a3, _b, _c;
     super();
     // Internal state
     this.pollTimer = null;
@@ -672,8 +1197,8 @@ var Session = class extends TypedEventEmitter {
     // For send() blocking behavior
     this.pendingResolve = null;
     this.client = clientOrOptions instanceof AomiClient ? clientOrOptions : new AomiClient(clientOrOptions);
-    this.sessionId = (_a2 = sessionOptions == null ? void 0 : sessionOptions.sessionId) != null ? _a2 : crypto.randomUUID();
-    this.namespace = (_b = sessionOptions == null ? void 0 : sessionOptions.namespace) != null ? _b : "default";
+    this.sessionId = (_a3 = sessionOptions == null ? void 0 : sessionOptions.sessionId) != null ? _a3 : crypto.randomUUID();
+    this.app = (_b = sessionOptions == null ? void 0 : sessionOptions.app) != null ? _b : "default";
     this.publicKey = sessionOptions == null ? void 0 : sessionOptions.publicKey;
     this.apiKey = sessionOptions == null ? void 0 : sessionOptions.apiKey;
     this.userState = sessionOptions == null ? void 0 : sessionOptions.userState;
@@ -699,11 +1224,12 @@ var Session = class extends TypedEventEmitter {
   async send(message) {
     this.assertOpen();
     const response = await this.client.sendMessage(this.sessionId, message, {
-      namespace: this.namespace,
+      app: this.app,
       publicKey: this.publicKey,
       apiKey: this.apiKey,
       userState: this.userState
     });
+    this.assertUserStateAligned(response.user_state);
     this.applyState(response);
     if (!response.is_processing && this.walletRequests.length === 0) {
       return { messages: this._messages, title: this._title };
@@ -722,11 +1248,12 @@ var Session = class extends TypedEventEmitter {
   async sendAsync(message) {
     this.assertOpen();
     const response = await this.client.sendMessage(this.sessionId, message, {
-      namespace: this.namespace,
+      app: this.app,
       publicKey: this.publicKey,
       apiKey: this.apiKey,
       userState: this.userState
     });
+    this.assertUserStateAligned(response.user_state);
     this.applyState(response);
     if (response.is_processing) {
       this._isProcessing = true;
@@ -743,14 +1270,14 @@ var Session = class extends TypedEventEmitter {
    * Sends the result to the backend and resumes polling.
    */
   async resolve(requestId, result) {
-    var _a2;
+    var _a3;
     const req = this.removeWalletRequest(requestId);
     if (!req) {
       throw new Error(`No pending wallet request with id "${requestId}"`);
     }
     if (req.kind === "transaction") {
       await this.sendSystemEvent("wallet:tx_complete", {
-        txHash: (_a2 = result.txHash) != null ? _a2 : "",
+        txHash: (_a3 = result.txHash) != null ? _a3 : "",
         status: "success",
         amount: result.amount
       });
@@ -811,11 +1338,11 @@ var Session = class extends TypedEventEmitter {
    * The session cannot be used after closing.
    */
   close() {
-    var _a2;
+    var _a3;
     if (this.closed) return;
     this.closed = true;
     this.stopPolling();
-    (_a2 = this.unsubscribeSSE) == null ? void 0 : _a2.call(this);
+    (_a3 = this.unsubscribeSSE) == null ? void 0 : _a3.call(this);
     this.unsubscribeSSE = null;
     this.resolvePending();
     this.removeAllListeners();
@@ -839,27 +1366,44 @@ var Session = class extends TypedEventEmitter {
   getIsProcessing() {
     return this._isProcessing;
   }
+  resolveUserState(userState) {
+    this.userState = userState;
+    const address = userState["address"];
+    if (typeof address === "string" && address.length > 0) {
+      this.publicKey = address;
+    }
+  }
+  resolveWallet(address, chainId) {
+    this.resolveUserState({ address, chainId: chainId != null ? chainId : 1, isConnected: true });
+  }
+  async syncUserState() {
+    this.assertOpen();
+    const state = await this.client.fetchState(this.sessionId, this.userState);
+    this.assertUserStateAligned(state.user_state);
+    this.applyState(state);
+    return state;
+  }
   // ===========================================================================
   // Internal — Polling (ported from PollingController)
   // ===========================================================================
   startPolling() {
-    var _a2;
+    var _a3;
     if (this.pollTimer || this.closed) return;
-    (_a2 = this.logger) == null ? void 0 : _a2.debug("[session] polling started", this.sessionId);
+    (_a3 = this.logger) == null ? void 0 : _a3.debug("[session] polling started", this.sessionId);
     this.pollTimer = setInterval(() => {
       void this.pollTick();
     }, this.pollIntervalMs);
   }
   stopPolling() {
-    var _a2;
+    var _a3;
     if (this.pollTimer) {
       clearInterval(this.pollTimer);
       this.pollTimer = null;
-      (_a2 = this.logger) == null ? void 0 : _a2.debug("[session] polling stopped", this.sessionId);
+      (_a3 = this.logger) == null ? void 0 : _a3.debug("[session] polling stopped", this.sessionId);
     }
   }
   async pollTick() {
-    var _a2;
+    var _a3;
     if (!this.pollTimer) return;
     try {
       const state = await this.client.fetchState(
@@ -867,6 +1411,7 @@ var Session = class extends TypedEventEmitter {
         this.userState
       );
       if (!this.pollTimer) return;
+      this.assertUserStateAligned(state.user_state);
       this.applyState(state);
       if (!state.is_processing && this.walletRequests.length === 0) {
         this.stopPolling();
@@ -875,7 +1420,7 @@ var Session = class extends TypedEventEmitter {
         this.resolvePending();
       }
     } catch (error) {
-      (_a2 = this.logger) == null ? void 0 : _a2.debug("[session] poll error", error);
+      (_a3 = this.logger) == null ? void 0 : _a3.debug("[session] poll error", error);
       this.emit("error", { error });
     }
   }
@@ -883,7 +1428,7 @@ var Session = class extends TypedEventEmitter {
   // Internal — State Application
   // ===========================================================================
   applyState(state) {
-    var _a2;
+    var _a3;
     if (state.messages) {
       this._messages = state.messages;
       this.emit("messages", this._messages);
@@ -891,12 +1436,12 @@ var Session = class extends TypedEventEmitter {
     if (state.title) {
       this._title = state.title;
     }
-    if ((_a2 = state.system_events) == null ? void 0 : _a2.length) {
+    if ((_a3 = state.system_events) == null ? void 0 : _a3.length) {
       this.dispatchSystemEvents(state.system_events);
     }
   }
   dispatchSystemEvents(events) {
-    var _a2;
+    var _a3;
     for (const event of events) {
       const unwrapped = unwrapSystemEvent(event);
       if (!unwrapped) continue;
@@ -907,7 +1452,7 @@ var Session = class extends TypedEventEmitter {
           this.emit("wallet_tx_request", req);
         }
       } else if (unwrapped.type === "wallet_eip712_request") {
-        const payload = normalizeEip712Payload((_a2 = unwrapped.payload) != null ? _a2 : {});
+        const payload = normalizeEip712Payload((_a3 = unwrapped.payload) != null ? _a3 : {});
         const req = this.enqueueWalletRequest("eip712_sign", payload);
         this.emit("wallet_eip712_request", req);
       } else if (unwrapped.type === "system_notice" || unwrapped.type === "system_error" || unwrapped.type === "async_callback") {
@@ -968,289 +1513,170 @@ var Session = class extends TypedEventEmitter {
       throw new Error("Session is closed");
     }
   }
+  assertUserStateAligned(actualUserState) {
+    if (!this.userState) {
+      return;
+    }
+    if (!actualUserState || !isSubsetMatch(this.userState, actualUserState)) {
+      const expected = JSON.stringify(sortJson(this.userState));
+      const actual = JSON.stringify(sortJson(actualUserState != null ? actualUserState : null));
+      throw new Error(
+        `Backend user_state mismatch. expected subset=${expected} actual=${actual}`
+      );
+    }
+  }
 };
 
-// src/cli-state.ts
-import { readFileSync, writeFileSync, unlinkSync, existsSync } from "fs";
-import { join } from "path";
-import { tmpdir } from "os";
-var _a;
-var STATE_FILE = join(
-  (_a = process.env.XDG_RUNTIME_DIR) != null ? _a : tmpdir(),
-  "aomi-session.json"
-);
-function readState() {
-  try {
-    if (!existsSync(STATE_FILE)) return null;
-    const raw = readFileSync(STATE_FILE, "utf-8");
-    return JSON.parse(raw);
-  } catch (e) {
-    return null;
+// src/cli/context.ts
+function getOrCreateSession(runtime) {
+  const { config } = runtime;
+  let state = readState();
+  if (!state) {
+    state = {
+      sessionId: crypto.randomUUID(),
+      baseUrl: config.baseUrl,
+      app: config.app,
+      apiKey: config.apiKey,
+      publicKey: config.publicKey,
+      chainId: config.chain
+    };
+    writeState(state);
+  } else {
+    let changed = false;
+    if (config.baseUrl !== state.baseUrl) {
+      state.baseUrl = config.baseUrl;
+      changed = true;
+    }
+    if (config.app !== state.app) {
+      state.app = config.app;
+      changed = true;
+    }
+    if (config.apiKey !== void 0 && config.apiKey !== state.apiKey) {
+      state.apiKey = config.apiKey;
+      changed = true;
+    }
+    if (config.publicKey !== void 0 && config.publicKey !== state.publicKey) {
+      state.publicKey = config.publicKey;
+      changed = true;
+    }
+    if (config.chain !== void 0 && config.chain !== state.chainId) {
+      state.chainId = config.chain;
+      changed = true;
+    }
+    if (changed) writeState(state);
   }
-}
-function writeState(state) {
-  writeFileSync(STATE_FILE, JSON.stringify(state, null, 2));
-}
-function clearState() {
-  try {
-    if (existsSync(STATE_FILE)) unlinkSync(STATE_FILE);
-  } catch (e) {
+  const session = new ClientSession(
+    { baseUrl: state.baseUrl, apiKey: state.apiKey },
+    {
+      sessionId: state.sessionId,
+      app: state.app,
+      apiKey: state.apiKey,
+      publicKey: state.publicKey
+    }
+  );
+  if (state.publicKey) {
+    session.resolveWallet(state.publicKey, state.chainId);
   }
+  return { session, state };
 }
-function getNextTxId(state) {
-  var _a2, _b;
-  const allIds = [
-    ...(_a2 = state.pendingTxs) != null ? _a2 : [],
-    ...(_b = state.signedTxs) != null ? _b : []
-  ].map((t) => {
-    const m = t.id.match(/^tx-(\d+)$/);
-    return m ? parseInt(m[1], 10) : 0;
+function createControlClient(runtime) {
+  return new AomiClient({
+    baseUrl: runtime.config.baseUrl,
+    apiKey: runtime.config.apiKey
   });
-  const max = allIds.length > 0 ? Math.max(...allIds) : 0;
-  return `tx-${max + 1}`;
 }
-function addPendingTx(state, tx) {
-  if (!state.pendingTxs) state.pendingTxs = [];
-  const pending = __spreadProps(__spreadValues({}, tx), {
-    id: getNextTxId(state)
+async function applyModelSelection(session, state, model) {
+  await session.client.setModel(state.sessionId, model, {
+    app: state.app,
+    apiKey: state.apiKey
   });
-  state.pendingTxs.push(pending);
-  writeState(state);
-  return pending;
-}
-function removePendingTx(state, id) {
-  if (!state.pendingTxs) return null;
-  const idx = state.pendingTxs.findIndex((t) => t.id === id);
-  if (idx === -1) return null;
-  const [removed] = state.pendingTxs.splice(idx, 1);
-  writeState(state);
-  return removed;
-}
-function addSignedTx(state, tx) {
-  if (!state.signedTxs) state.signedTxs = [];
-  state.signedTxs.push(tx);
+  state.model = model;
   writeState(state);
 }
-
-// src/cli.ts
-var CliExit = class extends Error {
-  constructor(code) {
-    super();
-    this.code = code;
-  }
-};
-function fatal(message) {
-  console.error(message);
-  throw new CliExit(1);
-}
-function printDataFileLocation() {
-  console.log(`Data stored at ${STATE_FILE} \u{1F4DD}`);
-}
-function parseArgs(argv) {
-  const raw = argv.slice(2);
-  const command = raw[0] && !raw[0].startsWith("--") ? raw[0] : void 0;
-  const rest = command ? raw.slice(1) : raw;
-  const positional = [];
-  const flags = {};
-  for (let i = 0; i < rest.length; i++) {
-    const arg = rest[i];
-    if (arg.startsWith("--") && arg.includes("=")) {
-      const [key, ...val] = arg.slice(2).split("=");
-      flags[key] = val.join("=");
-    } else if (arg.startsWith("--")) {
-      const key = arg.slice(2);
-      const next = rest[i + 1];
-      if (next && !next.startsWith("-")) {
-        flags[key] = next;
-        i++;
-      } else {
-        flags[key] = "true";
-      }
-    } else if (arg.startsWith("-") && arg.length === 2) {
-      flags[arg.slice(1)] = "true";
-    } else {
-      positional.push(arg);
-    }
+async function applyRequestedModelIfPresent(runtime, session, state) {
+  const requestedModel = runtime.config.model;
+  if (!requestedModel || requestedModel === state.model) {
+    return;
   }
-  return { command, positional, flags };
-}
-var parsed = parseArgs(process.argv);
-function getConfig() {
-  var _a2, _b, _c, _d, _e, _f, _g, _h;
-  return {
-    baseUrl: (_b = (_a2 = parsed.flags["backend-url"]) != null ? _a2 : process.env.AOMI_BASE_URL) != null ? _b : "https://api.aomi.dev",
-    apiKey: (_c = parsed.flags["api-key"]) != null ? _c : process.env.AOMI_API_KEY,
-    namespace: (_e = (_d = parsed.flags["namespace"]) != null ? _d : process.env.AOMI_NAMESPACE) != null ? _e : "default",
-    publicKey: (_f = parsed.flags["public-key"]) != null ? _f : process.env.AOMI_PUBLIC_KEY,
-    privateKey: (_g = parsed.flags["private-key"]) != null ? _g : process.env.PRIVATE_KEY,
-    chainRpcUrl: (_h = parsed.flags["rpc-url"]) != null ? _h : process.env.CHAIN_RPC_URL
-  };
+  await applyModelSelection(session, state, requestedModel);
 }
-function getOrCreateSession() {
-  const config = getConfig();
-  let state = readState();
-  if (!state) {
-    state = {
-      sessionId: crypto.randomUUID(),
-      baseUrl: config.baseUrl,
-      namespace: config.namespace,
-      apiKey: config.apiKey,
-      publicKey: config.publicKey
-    };
-    writeState(state);
-  } else {
-    let changed = false;
-    if (config.baseUrl && config.baseUrl !== state.baseUrl) {
-      state.baseUrl = config.baseUrl;
-      changed = true;
-    }
-    if (config.namespace && config.namespace !== state.namespace) {
-      state.namespace = config.namespace;
-      changed = true;
-    }
-    if (config.apiKey !== void 0 && config.apiKey !== state.apiKey) {
-      state.apiKey = config.apiKey;
-      changed = true;
-    }
-    if (config.publicKey !== void 0 && config.publicKey !== state.publicKey) {
-      state.publicKey = config.publicKey;
-      changed = true;
-    }
-    if (changed) writeState(state);
-  }
-  const session = new Session(
-    { baseUrl: state.baseUrl, apiKey: state.apiKey },
-    {
-      sessionId: state.sessionId,
-      namespace: state.namespace,
-      apiKey: state.apiKey,
-      publicKey: state.publicKey,
-      userState: state.publicKey ? {
-        address: state.publicKey,
-        chainId: 1,
-        isConnected: true
-      } : void 0
-    }
-  );
-  return { session, state };
-}
-function walletRequestToPendingTx(req) {
-  if (req.kind === "transaction") {
-    const p2 = req.payload;
+
+// src/cli/transactions.ts
+function walletRequestToPendingTx(request) {
+  if (request.kind === "transaction") {
+    const payload2 = request.payload;
     return {
       kind: "transaction",
-      to: p2.to,
-      value: p2.value,
-      data: p2.data,
-      chainId: p2.chainId,
-      timestamp: req.timestamp,
-      payload: req.payload
+      to: payload2.to,
+      value: payload2.value,
+      data: payload2.data,
+      chainId: payload2.chainId,
+      timestamp: request.timestamp,
+      payload: request.payload
     };
   }
-  const p = req.payload;
+  const payload = request.payload;
   return {
     kind: "eip712_sign",
-    description: p.description,
-    timestamp: req.timestamp,
-    payload: req.payload
+    description: payload.description,
+    timestamp: request.timestamp,
+    payload: request.payload
   };
 }
 function formatTxLine(tx, prefix) {
-  var _a2;
+  var _a3;
   const parts = [`${prefix} ${tx.id}`];
   if (tx.kind === "transaction") {
-    parts.push(`to: ${(_a2 = tx.to) != null ? _a2 : "?"}`);
+    parts.push(`to: ${(_a3 = tx.to) != null ? _a3 : "?"}`);
     if (tx.value) parts.push(`value: ${tx.value}`);
     if (tx.chainId) parts.push(`chain: ${tx.chainId}`);
     if (tx.data) parts.push(`data: ${tx.data.slice(0, 20)}...`);
   } else {
-    parts.push(`eip712`);
+    parts.push("eip712");
     if (tx.description) parts.push(tx.description);
   }
   parts.push(`(${new Date(tx.timestamp).toLocaleTimeString()})`);
   return parts.join("  ");
 }
-var DIM = "\x1B[2m";
-var CYAN = "\x1B[36m";
-var YELLOW = "\x1B[33m";
-var GREEN = "\x1B[32m";
-var RESET = "\x1B[0m";
-function printToolUpdate(event) {
-  var _a2, _b, _c;
-  const name = (_b = (_a2 = event.tool_name) != null ? _a2 : event.name) != null ? _b : "unknown";
-  const status = (_c = event.status) != null ? _c : "running";
-  console.log(`${DIM}\u{1F527} [tool] ${name}: ${status}${RESET}`);
-}
-function printToolComplete(event) {
-  var _a2, _b, _c;
-  const name = (_b = (_a2 = event.tool_name) != null ? _a2 : event.name) != null ? _b : "unknown";
-  const result = (_c = event.result) != null ? _c : event.output;
-  const line = result ? `${GREEN}\u2714 [tool] ${name} \u2192 ${result.slice(0, 120)}${result.length > 120 ? "\u2026" : ""}${RESET}` : `${GREEN}\u2714 [tool] ${name} done${RESET}`;
-  console.log(line);
-}
-function printNewAgentMessages(messages, lastPrintedCount) {
-  const agentMessages = messages.filter(
-    (m) => m.sender === "agent" || m.sender === "assistant"
-  );
-  let handled = lastPrintedCount;
-  for (let i = lastPrintedCount; i < agentMessages.length; i++) {
-    const msg = agentMessages[i];
-    if (msg.is_streaming) {
-      break;
-    }
-    if (msg.content) {
-      console.log(`${CYAN}\u{1F916} ${msg.content}${RESET}`);
-    }
-    handled = i + 1;
-  }
-  return handled;
-}
-async function chatCommand() {
-  const message = parsed.positional.join(" ");
+
+// src/cli/commands/chat.ts
+async function chatCommand(runtime) {
+  const message = runtime.parsed.positional.join(" ");
   if (!message) {
     fatal("Usage: aomi chat <message>");
   }
-  const verbose = parsed.flags["verbose"] === "true" || parsed.flags["v"] === "true";
-  const { session, state } = getOrCreateSession();
-  if (state.publicKey) {
-    await session.client.sendSystemMessage(
-      session.sessionId,
-      JSON.stringify({
-        type: "wallet:state_changed",
-        payload: {
-          address: state.publicKey,
-          chainId: 1,
-          isConnected: true
-        }
-      })
-    );
-  }
-  const capturedRequests = [];
-  let printedAgentCount = 0;
-  session.on("wallet_tx_request", (req) => capturedRequests.push(req));
-  session.on("wallet_eip712_request", (req) => capturedRequests.push(req));
+  const verbose = runtime.parsed.flags["verbose"] === "true" || runtime.parsed.flags["v"] === "true";
+  const { session, state } = getOrCreateSession(runtime);
   try {
-    await session.sendAsync(message);
-    const allMsgs = session.getMessages();
-    let seedIdx = allMsgs.length;
-    for (let i = allMsgs.length - 1; i >= 0; i--) {
-      if (allMsgs[i].sender === "user") {
-        seedIdx = i;
-        break;
+    await applyRequestedModelIfPresent(runtime, session, state);
+    if (state.publicKey) {
+      session.resolveWallet(state.publicKey, state.chainId);
+    }
+    const capturedRequests = [];
+    let printedAgentCount = 0;
+    const seenToolResults = /* @__PURE__ */ new Set();
+    session.on("wallet_tx_request", (request) => capturedRequests.push(request));
+    session.on(
+      "wallet_eip712_request",
+      (request) => capturedRequests.push(request)
+    );
+    session.on("tool_complete", (event) => {
+      const name = getToolNameFromEvent(event);
+      const result = getToolResultFromEvent(event);
+      const key = toToolResultKey(name, result);
+      seenToolResults.add(key);
+      if (verbose || isAlwaysVisibleTool(name)) {
+        printToolComplete(event);
       }
-    }
-    printedAgentCount = allMsgs.slice(0, seedIdx).filter(
-      (m) => m.sender === "agent" || m.sender === "assistant"
-    ).length;
+    });
+    session.on("tool_update", (event) => {
+      if (verbose) {
+        printToolUpdate(event);
+      }
+    });
     if (verbose) {
-      if (session.getIsProcessing()) {
+      session.on("processing_start", () => {
         console.log(`${DIM}\u23F3 Processing\u2026${RESET}`);
-      }
-      printedAgentCount = printNewAgentMessages(allMsgs, printedAgentCount);
-      session.on("tool_update", (event) => printToolUpdate(event));
-      session.on("tool_complete", (event) => printToolComplete(event));
-      session.on("messages", (msgs) => {
-        printedAgentCount = printNewAgentMessages(msgs, printedAgentCount);
       });
       session.on("system_notice", ({ message: msg }) => {
         console.log(`${YELLOW}\u{1F4E2} ${msg}${RESET}`);
@@ -1259,6 +1685,27 @@ async function chatCommand() {
         console.log(`\x1B[31m\u274C ${msg}${RESET}`);
       });
     }
+    await session.sendAsync(message);
+    const allMessages = session.getMessages();
+    let seedIdx = allMessages.length;
+    for (let i = allMessages.length - 1; i >= 0; i--) {
+      if (allMessages[i].sender === "user") {
+        seedIdx = i;
+        break;
+      }
+    }
+    printedAgentCount = allMessages.slice(0, seedIdx).filter(
+      (entry) => entry.sender === "agent" || entry.sender === "assistant"
+    ).length;
+    if (verbose) {
+      printedAgentCount = printNewAgentMessages(
+        allMessages,
+        printedAgentCount
+      );
+      session.on("messages", (messages) => {
+        printedAgentCount = printNewAgentMessages(messages, printedAgentCount);
+      });
+    }
     if (session.getIsProcessing()) {
       await new Promise((resolve) => {
         const checkWallet = () => {
@@ -1269,27 +1716,54 @@ async function chatCommand() {
         session.on("processing_end", () => resolve());
       });
     }
+    const messageToolResults = getMessageToolResults(
+      session.getMessages(),
+      seedIdx + 1
+    );
+    if (verbose) {
+      for (const tool of messageToolResults) {
+        const key = toToolResultKey(tool.name, tool.result);
+        if (seenToolResults.has(key)) {
+          continue;
+        }
+        printToolResultLine(tool.name, tool.result);
+      }
+    } else {
+      for (const tool of messageToolResults) {
+        const key = toToolResultKey(tool.name, tool.result);
+        if (seenToolResults.has(key)) {
+          continue;
+        }
+        if (isAlwaysVisibleTool(tool.name)) {
+          printToolResultLine(tool.name, tool.result);
+        }
+      }
+    }
     if (verbose) {
-      printNewAgentMessages(session.getMessages(), printedAgentCount);
+      printedAgentCount = printNewAgentMessages(
+        session.getMessages(),
+        printedAgentCount
+      );
       console.log(`${DIM}\u2705 Done${RESET}`);
     }
-    for (const req of capturedRequests) {
-      const pending = addPendingTx(state, walletRequestToPendingTx(req));
+    for (const request of capturedRequests) {
+      const pending = addPendingTx(state, walletRequestToPendingTx(request));
       console.log(`\u26A1 Wallet request queued: ${pending.id}`);
-      if (req.kind === "transaction") {
-        const p = req.payload;
-        console.log(`   to:    ${p.to}`);
-        if (p.value) console.log(`   value: ${p.value}`);
-        if (p.chainId) console.log(`   chain: ${p.chainId}`);
+      if (request.kind === "transaction") {
+        const payload = request.payload;
+        console.log(`   to:    ${payload.to}`);
+        if (payload.value) console.log(`   value: ${payload.value}`);
+        if (payload.chainId) console.log(`   chain: ${payload.chainId}`);
       } else {
-        const p = req.payload;
-        if (p.description) console.log(`   desc:  ${p.description}`);
+        const payload = request.payload;
+        if (payload.description) {
+          console.log(`   desc:  ${payload.description}`);
+        }
       }
     }
     if (!verbose) {
-      const messages = session.getMessages();
-      const agentMessages = messages.filter(
-        (m) => m.sender === "agent" || m.sender === "assistant"
+      const agentMessages = session.getMessages().filter(
+        (entry) => entry.sender === "agent" || entry.sender === "assistant"
       );
       const last = agentMessages[agentMessages.length - 1];
       if (last == null ? void 0 : last.content) {
@@ -1299,22 +1773,24 @@ async function chatCommand() {
       }
     }
     if (capturedRequests.length > 0) {
-      console.log(`
-Run \`aomi tx\` to see pending transactions, \`aomi sign <id>\` to sign.`);
+      console.log(
+        "\nRun `aomi tx` to see pending transactions, `aomi sign <id>` to sign."
+      );
     }
   } finally {
     session.close();
   }
 }
-async function statusCommand() {
-  var _a2, _b, _c, _d, _e, _f, _g, _h;
-  const state = readState();
-  if (!state) {
+
+// 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;
   }
-  const { session } = getOrCreateSession();
+  const { session, state } = getOrCreateSession(runtime);
   try {
     const apiState = await session.client.fetchState(state.sessionId);
     console.log(
@@ -1322,12 +1798,13 @@ async function statusCommand() {
         {
           sessionId: state.sessionId,
           baseUrl: state.baseUrl,
-          namespace: state.namespace,
-          isProcessing: (_a2 = apiState.is_processing) != null ? _a2 : false,
-          messageCount: (_c = (_b = apiState.messages) == null ? void 0 : _b.length) != null ? _c : 0,
-          title: (_d = apiState.title) != null ? _d : null,
-          pendingTxs: (_f = (_e = state.pendingTxs) == null ? void 0 : _e.length) != null ? _f : 0,
-          signedTxs: (_h = (_g = state.signedTxs) == null ? void 0 : _g.length) != null ? _h : 0
+          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
@@ -1338,13 +1815,12 @@ async function statusCommand() {
     session.close();
   }
 }
-async function eventsCommand() {
-  const state = readState();
-  if (!state) {
+async function eventsCommand(runtime) {
+  if (!readState()) {
     console.log("No active session");
     return;
   }
-  const { session } = getOrCreateSession();
+  const { session, state } = getOrCreateSession(runtime);
   try {
     const events = await session.client.getSystemEvents(state.sessionId);
     console.log(JSON.stringify(events, null, 2));
@@ -1352,15 +1828,372 @@ async function eventsCommand() {
     session.close();
   }
 }
+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;
+  }
+  for (const model of models) {
+    const marker = (state == null ? void 0 : state.model) === model ? "  (current)" : "";
+    console.log(`${model}${marker}`);
+  }
+}
+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;
+  }
+  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>");
+  }
+  const { session, state } = getOrCreateSession(runtime);
+  try {
+    await applyModelSelection(session, state, model);
+    console.log(`Model set to ${model}`);
+    printDataFileLocation();
+  } finally {
+    session.close();
+  }
+}
+
+// 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 {
+    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;
+  return {
+    id: tx.id,
+    kind: tx.kind,
+    txHash: (_a3 = tx.txHash) != null ? _a3 : null,
+    signature: (_b = tx.signature) != null ? _b : null,
+    from: (_c = tx.from) != null ? _c : null,
+    to: (_d = tx.to) != null ? _d : null,
+    value: (_e = tx.value) != null ? _e : null,
+    chainId: (_f = tx.chainId) != null ? _f : null,
+    description: (_g = tx.description) != null ? _g : null,
+    timestamp: new Date(tx.timestamp).toISOString()
+  };
+}
+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}`);
+  }
+}
+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}`);
+  }
+}
+
+// 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 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}`);
+    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 {
+      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;
+  }
+}
+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 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();
+    }
+  }
+  printDataFileLocation();
+}
+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>");
+    }
+    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;
+  }
+  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;
+  }
+  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 { privateKeyToAccount } from "viem/accounts";
+import * as viemChains from "viem/chains";
 function txCommand() {
-  var _a2, _b, _c;
+  var _a3, _b, _c;
   const state = readState();
   if (!state) {
     console.log("No active session");
     printDataFileLocation();
     return;
   }
-  const pending = (_a2 = state.pendingTxs) != null ? _a2 : [];
+  const pending = (_a3 = state.pendingTxs) != null ? _a3 : [];
   const signed = (_b = state.signedTxs) != null ? _b : [];
   if (pending.length === 0 && signed.length === 0) {
     console.log("No transactions.");
@@ -1392,48 +2225,112 @@ function txCommand() {
   }
   printDataFileLocation();
 }
-async function signCommand() {
-  var _a2, _b, _c, _d;
-  const txId = parsed.positional[0];
+function requirePendingTx(state, txId) {
+  var _a3;
+  const pendingTx = ((_a3 = state.pendingTxs) != null ? _a3 : []).find((tx) => tx.id === txId);
+  if (!pendingTx) {
+    fatal(
+      `No pending transaction with id "${txId}".
+Run \`aomi tx\` to see available IDs.`
+    );
+  }
+  return pendingTx;
+}
+function rewriteSessionState(runtime, state) {
+  let changed = false;
+  if (runtime.config.baseUrl !== state.baseUrl) {
+    state.baseUrl = runtime.config.baseUrl;
+    changed = true;
+  }
+  if (runtime.config.app !== state.app) {
+    state.app = runtime.config.app;
+    changed = true;
+  }
+  if (runtime.config.apiKey !== void 0 && runtime.config.apiKey !== state.apiKey) {
+    state.apiKey = runtime.config.apiKey;
+    changed = true;
+  }
+  if (runtime.config.chain !== void 0 && runtime.config.chain !== state.chainId) {
+    state.chainId = runtime.config.chain;
+    changed = true;
+  }
+  if (changed) {
+    writeState(state);
+  }
+}
+function createSessionFromState(state) {
+  const session = new ClientSession(
+    { baseUrl: state.baseUrl, apiKey: state.apiKey },
+    {
+      sessionId: state.sessionId,
+      app: state.app,
+      apiKey: state.apiKey,
+      publicKey: state.publicKey
+    }
+  );
+  if (state.publicKey) {
+    session.resolveWallet(state.publicKey, state.chainId);
+  }
+  return session;
+}
+async function persistResolvedSignerState(session, state, address, chainId) {
+  state.publicKey = address;
+  writeState(state);
+  session.resolveWallet(address, chainId);
+  await session.syncUserState();
+}
+async function signCommand(runtime) {
+  var _a3, _b, _c, _d;
+  const txId = runtime.parsed.positional[0];
   if (!txId) {
-    fatal("Usage: aomi sign <tx-id>\nRun `aomi tx` to see pending transaction IDs.");
+    fatal(
+      "Usage: aomi sign <tx-id>\nRun `aomi tx` to see pending transaction IDs."
+    );
   }
-  const config = getConfig();
-  const privateKey = config.privateKey;
+  const privateKey = runtime.config.privateKey;
   if (!privateKey) {
-    fatal("Private key required. Pass --private-key or set PRIVATE_KEY env var.");
+    fatal(
+      [
+        "Private key required for `aomi sign`.",
+        "Pass one of:",
+        "  --private-key <hex-key>",
+        "  PRIVATE_KEY=<hex-key> aomi sign <tx-id>"
+      ].join("\n")
+    );
   }
   const state = readState();
   if (!state) {
     fatal("No active session. Run `aomi chat` first.");
   }
-  const pendingTx = ((_a2 = state.pendingTxs) != null ? _a2 : []).find((t) => t.id === txId);
-  if (!pendingTx) {
-    fatal(`No pending transaction with id "${txId}".
-Run \`aomi tx\` to see available IDs.`);
-  }
-  const { session } = getOrCreateSession();
+  rewriteSessionState(runtime, state);
+  const pendingTx = requirePendingTx(state, txId);
+  const session = createSessionFromState(state);
   try {
-    let viem;
-    let viemAccounts;
-    let viemChains;
-    try {
-      viem = await import("viem");
-      viemAccounts = await import("viem/accounts");
-      viemChains = await import("viem/chains");
-    } catch (e) {
-      fatal(
-        "viem is required for `aomi sign`. Install it:\n  npm install viem\n  # or: pnpm add viem"
+    const account = privateKeyToAccount(privateKey);
+    if (state.publicKey && account.address.toLowerCase() !== state.publicKey.toLowerCase()) {
+      console.log(
+        `\u26A0\uFE0F  Signer ${account.address} differs from session public key ${state.publicKey}`
       );
+      console.log("   Updating session to match the signing key...");
     }
-    const { createWalletClient, http } = viem;
-    const { privateKeyToAccount } = viemAccounts;
-    const account = privateKeyToAccount(privateKey);
-    const rpcUrl = config.chainRpcUrl;
-    const targetChainId = (_b = pendingTx.chainId) != null ? _b : 1;
+    const rpcUrl = runtime.config.chainRpcUrl;
+    const targetChainId = (_b = (_a3 = pendingTx.chainId) != null ? _a3 : state.chainId) != null ? _b : 1;
     const chain = (_c = Object.values(viemChains).find(
-      (c) => typeof c === "object" && c !== null && "id" in c && c.id === targetChainId
-    )) != null ? _c : { id: targetChainId, name: `Chain ${targetChainId}`, nativeCurrency: { name: "ETH", symbol: "ETH", decimals: 18 }, rpcUrls: { default: { http: [rpcUrl != null ? rpcUrl : ""] } } };
+      (candidate) => typeof candidate === "object" && candidate !== null && "id" in candidate && candidate.id === targetChainId
+    )) != null ? _c : {
+      id: targetChainId,
+      name: `Chain ${targetChainId}`,
+      nativeCurrency: {
+        name: "ETH",
+        symbol: "ETH",
+        decimals: 18
+      },
+      rpcUrls: {
+        default: {
+          http: [rpcUrl != null ? rpcUrl : ""]
+        }
+      }
+    };
     const walletClient = createWalletClient({
       account,
       chain,
@@ -1442,11 +2339,15 @@ Run \`aomi tx\` to see available IDs.`);
     console.log(`Signer:  ${account.address}`);
     console.log(`ID:      ${pendingTx.id}`);
     console.log(`Kind:    ${pendingTx.kind}`);
+    let signedRecord;
+    let backendNotification;
     if (pendingTx.kind === "transaction") {
       console.log(`To:      ${pendingTx.to}`);
       if (pendingTx.value) console.log(`Value:   ${pendingTx.value}`);
       if (pendingTx.chainId) console.log(`Chain:   ${pendingTx.chainId}`);
-      if (pendingTx.data) console.log(`Data:    ${pendingTx.data.slice(0, 40)}...`);
+      if (pendingTx.data) {
+        console.log(`Data:    ${pendingTx.data.slice(0, 40)}...`);
+      }
       console.log();
       const hash = await walletClient.sendTransaction({
         to: pendingTx.to,
@@ -1454,9 +2355,7 @@ Run \`aomi tx\` to see available IDs.`);
         data: (_d = pendingTx.data) != null ? _d : void 0
       });
       console.log(`\u2705 Sent! Hash: ${hash}`);
-      removePendingTx(state, txId);
-      const freshState = readState();
-      addSignedTx(freshState, {
+      signedRecord = {
         id: txId,
         kind: "transaction",
         txHash: hash,
@@ -1465,21 +2364,22 @@ Run \`aomi tx\` to see available IDs.`);
         value: pendingTx.value,
         chainId: pendingTx.chainId,
         timestamp: Date.now()
-      });
-      await session.client.sendSystemMessage(
-        state.sessionId,
-        JSON.stringify({
-          type: "wallet:tx_complete",
-          payload: { txHash: hash, status: "success" }
-        })
-      );
+      };
+      backendNotification = {
+        type: "wallet:tx_complete",
+        payload: { txHash: hash, status: "success" }
+      };
     } else {
       const typedData = pendingTx.payload.typed_data;
       if (!typedData) {
         fatal("EIP-712 request is missing typed_data payload.");
       }
-      if (pendingTx.description) console.log(`Desc:    ${pendingTx.description}`);
-      if (typedData.primaryType) console.log(`Type:    ${typedData.primaryType}`);
+      if (pendingTx.description) {
+        console.log(`Desc:    ${pendingTx.description}`);
+      }
+      if (typedData.primaryType) {
+        console.log(`Type:    ${typedData.primaryType}`);
+      }
       console.log();
       const { domain, types, primaryType, message } = typedData;
       const sigTypes = __spreadValues({}, types);
@@ -1491,28 +2391,36 @@ Run \`aomi tx\` to see available IDs.`);
         message
       });
       console.log(`\u2705 Signed! Signature: ${signature.slice(0, 20)}...`);
-      removePendingTx(state, txId);
-      const freshState = readState();
-      addSignedTx(freshState, {
+      signedRecord = {
         id: txId,
         kind: "eip712_sign",
         signature,
         from: account.address,
         description: pendingTx.description,
         timestamp: Date.now()
-      });
-      await session.client.sendSystemMessage(
-        state.sessionId,
-        JSON.stringify({
-          type: "wallet_eip712_response",
-          payload: {
-            status: "success",
-            signature,
-            description: pendingTx.description
-          }
-        })
-      );
+      };
+      backendNotification = {
+        type: "wallet_eip712_response",
+        payload: {
+          status: "success",
+          signature,
+          description: pendingTx.description
+        }
+      };
     }
+    await persistResolvedSignerState(
+      session,
+      state,
+      account.address,
+      targetChainId
+    );
+    removePendingTx(state, txId);
+    const freshState = readState();
+    addSignedTx(freshState, signedRecord);
+    await session.client.sendSystemMessage(
+      state.sessionId,
+      JSON.stringify(backendNotification)
+    );
     console.log("Backend notified.");
   } catch (err) {
     if (err instanceof CliExit) throw err;
@@ -1522,73 +2430,24 @@ Run \`aomi tx\` to see available IDs.`);
     session.close();
   }
 }
-async function logCommand() {
-  var _a2, _b, _c, _d, _e;
-  const state = readState();
-  if (!state) {
-    console.log("No active session");
-    printDataFileLocation();
-    return;
-  }
-  const { session } = getOrCreateSession();
-  try {
-    const apiState = await session.client.fetchState(state.sessionId);
-    const messages = (_a2 = apiState.messages) != null ? _a2 : [];
-    if (messages.length === 0) {
-      console.log("No messages in this session.");
-      printDataFileLocation();
-      return;
-    }
-    for (const msg of messages) {
-      let time = "";
-      if (msg.timestamp) {
-        const raw = msg.timestamp;
-        const n = /^\d+$/.test(raw) ? parseInt(raw, 10) : NaN;
-        const date = !isNaN(n) ? new Date(n < 1e12 ? n * 1e3 : n) : new Date(raw);
-        time = isNaN(date.getTime()) ? "" : `${DIM}${date.toLocaleTimeString()}${RESET} `;
-      }
-      const sender = (_b = msg.sender) != null ? _b : "unknown";
-      if (sender === "user") {
-        console.log(`${time}${CYAN}\u{1F464} You:${RESET} ${(_c = msg.content) != null ? _c : ""}`);
-      } else if (sender === "agent" || sender === "assistant") {
-        if (msg.tool_result) {
-          const [toolName, result] = msg.tool_result;
-          console.log(
-            `${time}${GREEN}\u{1F527} [${toolName}]${RESET} ${result.slice(0, 200)}${result.length > 200 ? "\u2026" : ""}`
-          );
-        }
-        if (msg.content) {
-          console.log(`${time}${CYAN}\u{1F916} Agent:${RESET} ${msg.content}`);
-        }
-      } else if (sender === "system") {
-        console.log(`${time}${YELLOW}\u2699\uFE0F  System:${RESET} ${(_d = msg.content) != null ? _d : ""}`);
-      } else {
-        console.log(`${time}${DIM}[${sender}]${RESET} ${(_e = msg.content) != null ? _e : ""}`);
-      }
-    }
-    console.log(`
-${DIM}\u2014 ${messages.length} messages \u2014${RESET}`);
-    printDataFileLocation();
-  } finally {
-    session.close();
-  }
-}
-function closeCommand() {
-  const state = readState();
-  if (state) {
-    const { session } = getOrCreateSession();
-    session.close();
-  }
-  clearState();
-  console.log("Session closed");
-}
+
+// src/cli/main.ts
 function printUsage() {
   console.log(`
 aomi \u2014 CLI client for Aomi on-chain agent
 
 Usage:
   aomi chat <message>   Send a message and print the response
+  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 model set <rig>  Set the active model for the current session
+  aomi sessions         List local sessions with metadata tables
+  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>     Sign and submit a pending transaction
@@ -1598,8 +2457,9 @@ Usage:
 
 Options:
   --backend-url <url>   Backend URL (default: https://api.aomi.dev)
-  --api-key <key>       API key for non-default namespaces
-  --namespace <ns>      Namespace (default: "default")
+  --api-key <key>       API key for non-default apps
+  --app <name>          App (default: "default")
+  --model <rig>         Set the active model for this session
   --public-key <addr>   Wallet address (so the agent knows your wallet)
   --private-key <key>   Hex private key for signing
   --rpc-url <url>       RPC URL for transaction submission
@@ -1608,50 +2468,86 @@ Options:
 Environment (overridden by flags):
   AOMI_BASE_URL         Backend URL
   AOMI_API_KEY          API key
-  AOMI_NAMESPACE        Namespace
+  AOMI_APP              App
+  AOMI_MODEL            Model rig
   AOMI_PUBLIC_KEY       Wallet address
   PRIVATE_KEY           Hex private key for signing
   CHAIN_RPC_URL         RPC URL for transaction submission
 `.trim());
 }
-async function main() {
-  var _a2;
-  const cmd = (_a2 = parsed.command) != null ? _a2 : parsed.flags["help"] || parsed.flags["h"] ? "help" : void 0;
-  switch (cmd) {
+async function main(runtime) {
+  var _a3;
+  const command = (_a3 = runtime.parsed.command) != null ? _a3 : runtime.parsed.flags["help"] || runtime.parsed.flags["h"] ? "help" : void 0;
+  switch (command) {
     case "chat":
-      await chatCommand();
+      await chatCommand(runtime);
       break;
     case "log":
-      await logCommand();
+      await logCommand(runtime);
+      break;
+    case "models":
+      await modelsCommand(runtime);
+      break;
+    case "model":
+      await modelCommand(runtime);
+      break;
+    case "sessions":
+      await sessionsCommand(runtime);
+      break;
+    case "session":
+      sessionCommand(runtime);
       break;
     case "tx":
       txCommand();
       break;
     case "sign":
-      await signCommand();
+      await signCommand(runtime);
       break;
     case "status":
-      await statusCommand();
+      await statusCommand(runtime);
       break;
     case "events":
-      await eventsCommand();
+      await eventsCommand(runtime);
       break;
     case "close":
-      closeCommand();
+      closeCommand(runtime);
       break;
     case "help":
       printUsage();
       break;
     default:
       printUsage();
-      if (cmd) throw new CliExit(1);
+      if (command) {
+        throw new CliExit(1);
+      }
   }
 }
-main().catch((err) => {
-  if (err instanceof CliExit) {
-    process.exit(err.code);
-    return;
+function isPnpmExecWrapper() {
+  var _a3, _b;
+  const npmCommand = (_a3 = process.env.npm_command) != null ? _a3 : "";
+  const userAgent = (_b = process.env.npm_config_user_agent) != null ? _b : "";
+  return npmCommand === "exec" && userAgent.includes("pnpm/");
+}
+async function runCli(argv = process.argv) {
+  const runtime = createRuntime(argv);
+  const RED = "\x1B[31m";
+  const RESET3 = "\x1B[0m";
+  const strictExit = process.env.AOMI_CLI_STRICT_EXIT === "1";
+  try {
+    await main(runtime);
+  } catch (err) {
+    if (err instanceof CliExit) {
+      if (!strictExit && isPnpmExecWrapper()) {
+        return;
+      }
+      process.exit(err.code);
+      return;
+    }
+    const message = err instanceof Error ? err.message : String(err);
+    console.error(`${RED}\u274C ${message}${RESET3}`);
+    process.exit(1);
   }
-  console.error(err instanceof Error ? err.message : err);
-  process.exit(1);
-});
+}
+
+// src/cli.ts
+void runCli();