@heyamiko/amiko-cli 0.8.4 → 0.9.0-beta.0

package/dist/index.js

@@ -5,43 +5,25 @@ var __getProtoOf = Object.getPrototypeOf;
 var __defProp = Object.defineProperty;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-function __accessProp(key) {
-  return this[key];
-}
-var __toESMCache_node;
-var __toESMCache_esm;
 var __toESM = (mod, isNodeMode, target) => {
-  var canCache = mod != null && typeof mod === "object";
-  if (canCache) {
-    var cache = isNodeMode ? __toESMCache_node ??= new WeakMap : __toESMCache_esm ??= new WeakMap;
-    var cached = cache.get(mod);
-    if (cached)
-      return cached;
-  }
   target = mod != null ? __create(__getProtoOf(mod)) : {};
   const to = isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target;
   for (let key of __getOwnPropNames(mod))
     if (!__hasOwnProp.call(to, key))
       __defProp(to, key, {
-        get: __accessProp.bind(mod, key),
+        get: () => mod[key],
         enumerable: true
       });
-  if (canCache)
-    cache.set(mod, to);
   return to;
 };
 var __commonJS = (cb, mod) => () => (mod || cb((mod = { exports: {} }).exports, mod), mod.exports);
-var __returnValue = (v) => v;
-function __exportSetter(name, newValue) {
-  this[name] = __returnValue.bind(null, newValue);
-}
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, {
       get: all[name],
       enumerable: true,
       configurable: true,
-      set: __exportSetter.bind(all, name)
+      set: (newValue) => all[name] = () => newValue
     });
 };
 var __esm = (fn, res) => () => (fn && (res = fn(fn = 0)), res);
@@ -3533,36 +3515,11 @@ var require_emoji_regex = __commonJS((exports, module) => {
   };
 });
 
-// node_modules/mppx/dist/Method.js
-var exports_Method = {};
-__export(exports_Method, {
-  toServer: () => toServer,
-  toClient: () => toClient,
-  from: () => from
-});
-function from(method) {
-  return method;
-}
-function toClient(method, options) {
-  const { context, createCredential } = options;
-  return {
-    ...method,
-    context,
-    createCredential
-  };
-}
-function toServer(method, options) {
-  const { defaults, html, request, respond, transport, verify } = options;
-  return {
-    ...method,
-    defaults,
-    html,
-    request,
-    respond,
-    transport,
-    verify
-  };
-}
+// node_modules/mppx/dist/BodyDigest.js
+var init_BodyDigest = () => {};
+
+// node_modules/mppx/dist/PaymentRequest.js
+var init_PaymentRequest = () => {};
 
 // node_modules/mppx/node_modules/zod/v4/core/core.js
 function $constructor(name, initializer, params) {
@@ -16647,8 +16604,89 @@ var init_zod = __esm(() => {
   init_mini();
 });
 
+// node_modules/mppx/dist/Challenge.js
+var Schema;
+var init_Challenge = __esm(() => {
+  init_zod();
+  Schema = object({
+    description: optional(string2()),
+    digest: optional(string2().check(_regex(/^sha-256=/, "Invalid digest format"))),
+    expires: optional(datetime3()),
+    id: string2(),
+    intent: string2(),
+    method: string2(),
+    opaque: optional(record(string2(), string2())),
+    realm: string2(),
+    request: record(string2(), unknown())
+  });
+});
+
+// node_modules/mppx/dist/Credential.js
+var init_Credential = () => {};
+
+// node_modules/mppx/dist/Errors.js
+var init_Errors = () => {};
+
+// node_modules/mppx/dist/Expires.js
+var init_Expires = () => {};
+
+// node_modules/mppx/dist/Method.js
+var exports_Method = {};
+__export(exports_Method, {
+  toServer: () => toServer,
+  toClient: () => toClient,
+  from: () => from
+});
+function from(method) {
+  return method;
+}
+function toClient(method, options) {
+  const { context, createCredential } = options;
+  return {
+    ...method,
+    context,
+    createCredential
+  };
+}
+function toServer(method, options) {
+  const { defaults, html, request, respond, transport, verify } = options;
+  return {
+    ...method,
+    defaults,
+    html,
+    request,
+    respond,
+    transport,
+    verify
+  };
+}
+
+// node_modules/mppx/dist/Receipt.js
+var Schema2;
+var init_Receipt = __esm(() => {
+  init_zod();
+  Schema2 = object({
+    method: string2(),
+    reference: string2(),
+    externalId: optional(string2()),
+    status: literal("success"),
+    timestamp: datetime3()
+  });
+});
+
+// node_modules/mppx/dist/Store.js
+var init_Store = () => {};
+
 // node_modules/mppx/dist/index.js
 var init_dist = __esm(() => {
+  init_BodyDigest();
+  init_Challenge();
+  init_Credential();
+  init_Errors();
+  init_Expires();
+  init_PaymentRequest();
+  init_Receipt();
+  init_Store();
   init_zod();
 });
 
@@ -16720,8 +16758,9 @@ var {
 } = import__.default;
 
 // src/onboarding.ts
-import { createInterface } from "node:readline";
-import { execFileSync } from "node:child_process";
+async function runOnboarding(_argv) {
+  return false;
+}
 
 // node_modules/chalk/source/vendor/ansi-styles/index.js
 var ANSI_BACKGROUND_OFFSET = 10;
@@ -17212,191 +17251,75 @@ var chalk = createChalk();
 var chalkStderr = createChalk({ level: stderrColor ? stderrColor.level : 0 });
 var source_default = chalk;
 
-// src/lib/config.ts
-import { existsSync, mkdirSync, readFileSync, unlinkSync, writeFileSync } from "node:fs";
-import { homedir } from "node:os";
-import { join } from "node:path";
-var CONFIG_DIR = join(homedir(), ".amiko");
-var CONFIG_FILE = join(CONFIG_DIR, "config.json");
-var DEFAULTS = {
-  apiBase: "https://mpp.amikomarkets.com",
-  billingBase: "https://billing.heyamiko.com",
-  siteBase: "https://platform.heyamiko.com"
-};
-var LEGACY_SITE_BASES = new Set([
-  "https://amiko-markets.vercel.app",
-  "https://amiko-markets.vercel.app/"
-]);
-function loadConfig() {
-  if (!existsSync(CONFIG_FILE))
-    return { ...DEFAULTS };
+// src/lib/agent-config.ts
+import { existsSync, readFileSync } from "node:fs";
+import { join, resolve } from "node:path";
+var OPENCLAW_FALLBACK_PATH = "/data/.openclaw/workspace/.amiko.json";
+function tryRead(filePath) {
+  if (!existsSync(filePath))
+    return null;
   try {
-    const raw = readFileSync(CONFIG_FILE, "utf-8");
-    const parsed = JSON.parse(raw);
-    return normalizeConfig({ ...DEFAULTS, ...parsed });
+    return JSON.parse(readFileSync(filePath, "utf-8"));
   } catch {
-    return { ...DEFAULTS };
-  }
-}
-function saveConfig(config) {
-  const current = loadConfig();
-  const merged = normalizeConfig({ ...current, ...config });
-  if (!existsSync(CONFIG_DIR))
-    mkdirSync(CONFIG_DIR, { recursive: true });
-  writeFileSync(CONFIG_FILE, JSON.stringify(merged, null, 2) + `
-`);
-  return merged;
-}
-function getConfigPath() {
-  return CONFIG_FILE;
-}
-function resetConfig() {
-  if (!existsSync(CONFIG_FILE))
-    return false;
-  unlinkSync(CONFIG_FILE);
-  return true;
-}
-function getPrivyToken(config) {
-  return config.privyToken;
-}
-function normalizeConfig(config) {
-  const normalized = { ...config };
-  const raw = normalized;
-  if (!normalized.privyToken && typeof raw.creatorToken === "string") {
-    normalized.privyToken = raw.creatorToken;
-    delete raw.creatorToken;
-  }
-  if (LEGACY_SITE_BASES.has(normalized.siteBase)) {
-    normalized.siteBase = DEFAULTS.siteBase;
+    return null;
   }
-  return normalized;
 }
-
-// src/lib/agent-config.ts
-import { existsSync as existsSync2, readFileSync as readFileSync2 } from "node:fs";
-import { join as join2, resolve } from "node:path";
-function loadAgentConfig() {
-  const knownPaths = [
-    process.env.OPENCLAW_WORKSPACE_DIR ? join2(process.env.OPENCLAW_WORKSPACE_DIR, ".amiko.json") : "",
-    process.env.OPENCLAW_HOME ? join2(process.env.OPENCLAW_HOME, ".openclaw", "workspace", ".amiko.json") : "",
-    "/data/.openclaw/workspace/.amiko.json",
-    "/data/.amiko.json"
-  ].filter(Boolean);
-  for (const p of knownPaths) {
-    const result = tryLoadConfig(p);
-    if (result)
-      return result;
-  }
+function findAmikoJson() {
   let dir = process.cwd();
   const root = resolve("/");
   while (dir !== root) {
-    const result = tryLoadConfig(join2(dir, ".amiko.json"));
-    if (result)
-      return result;
+    const parsed = tryRead(join(dir, ".amiko.json"));
+    if (parsed)
+      return parsed;
     dir = resolve(dir, "..");
   }
-  return null;
+  return tryRead(OPENCLAW_FALLBACK_PATH);
 }
-function tryLoadConfig(filePath) {
-  if (!existsSync2(filePath))
-    return null;
-  try {
-    const raw = readFileSync2(filePath, "utf-8");
-    const parsed = JSON.parse(raw);
-    const config = {};
-    config.twinToken = parsed.amikoTwinToken || parsed.AMIKO_TWIN_TOKEN || parsed.AMIKO_USER_TOKEN;
-    config.twinId = parsed.amikoTwinId || parsed.AMIKO_TWIN_ID;
-    config.userId = parsed.amikoUserId || parsed.AMIKO_USER_ID;
-    config.platformUrl = parsed.amikoPlatformUrl || parsed.AMIKO_PLATFORM_URL;
-    if (parsed.billingBase)
-      config.billingBase = parsed.billingBase;
-    if (parsed.platformKey)
-      config.platformKey = parsed.platformKey;
-    if (Array.isArray(parsed.agentWallets))
-      config.agentWallets = parsed.agentWallets;
-    return Object.keys(config).length > 0 ? config : null;
-  } catch {
-    return null;
-  }
+function asString(v) {
+  return typeof v === "string" && v.length > 0 ? v : undefined;
 }
-function resolveAuth(cliConfig) {
-  const agentConfig = loadAgentConfig();
-  if (agentConfig?.agentWallets?.length && !cliConfig.agentWallets?.length) {
-    cliConfig.agentWallets = agentConfig.agentWallets;
-  }
-  if (agentConfig?.billingBase && !cliConfig.billingBase) {
-    cliConfig.billingBase = agentConfig.billingBase;
-  }
-  if (agentConfig?.twinToken && !cliConfig.twinToken) {
-    cliConfig.twinToken = agentConfig.twinToken;
-  }
-  if (agentConfig?.twinId && !cliConfig.twinId) {
-    cliConfig.twinId = agentConfig.twinId;
-  }
-  if (agentConfig?.userId && !cliConfig.userId) {
-    cliConfig.userId = agentConfig.userId;
-  }
-  if (agentConfig?.platformKey && !cliConfig.apiKey) {
-    cliConfig.apiKey = agentConfig.platformKey;
-  }
-  if (cliConfig.agentWallets?.length) {
-    return {
-      mode: "connected",
-      platformUrl: cliConfig.platformUrl,
-      billingBase: cliConfig.billingBase,
-      twinId: cliConfig.twinId,
-      twinToken: cliConfig.twinToken,
-      platformKey: cliConfig.apiKey,
-      privyToken: cliConfig.privyToken,
-      connectedKeyId: cliConfig.connectedKeyId,
-      userId: cliConfig.userId,
-      agentWallets: cliConfig.agentWallets
-    };
-  }
-  if (cliConfig.privyToken && cliConfig.connectedKeyId) {
-    return {
-      mode: "connected",
-      billingBase: cliConfig.billingBase,
-      platformKey: cliConfig.privyToken,
-      privyToken: cliConfig.privyToken,
-      connectedKeyId: cliConfig.connectedKeyId,
-      userId: cliConfig.userId
-    };
-  }
-  if (cliConfig.apiKey) {
-    return {
-      mode: "connected",
-      billingBase: cliConfig.billingBase,
-      platformKey: cliConfig.apiKey,
-      userId: cliConfig.userId,
-      twinId: cliConfig.twinId,
-      twinToken: cliConfig.twinToken
-    };
-  }
-  const envToken = process.env.AMIKO_USER_TOKEN;
-  if (envToken) {
-    return {
-      mode: "agent",
-      twinId: process.env.AMIKO_TWIN_ID,
-      twinToken: envToken,
-      userId: process.env.AMIKO_USER_ID,
-      billingBase: process.env.API_SERVICE_URL || process.env.BILLING_BASE,
-      platformUrl: process.env.AMIKO_PLATFORM_URL
-    };
+function resolveAuth() {
+  const parsed = findAmikoJson();
+  if (!parsed)
+    return {};
+  return {
+    twinToken: asString(parsed.amikoTwinToken) ?? asString(parsed.AMIKO_TWIN_TOKEN) ?? asString(parsed.AMIKO_USER_TOKEN),
+    twinId: asString(parsed.amikoTwinId) ?? asString(parsed.AMIKO_TWIN_ID),
+    userId: asString(parsed.amikoUserId) ?? asString(parsed.AMIKO_USER_ID),
+    platformUrl: asString(parsed.amikoPlatformUrl) ?? asString(parsed.AMIKO_PLATFORM_URL),
+    billingBase: asString(parsed.billingBase),
+    apiBase: asString(parsed.apiBase)
+  };
+}
+function requireAuth() {
+  const auth = resolveAuth();
+  if (!auth.twinToken) {
+    throw new Error("No twin token found. Place an .amiko.json file with amikoTwinToken in the current directory or any parent (or at /data/.openclaw/workspace/.amiko.json).");
   }
-  if (agentConfig?.twinToken) {
-    return {
-      mode: "agent",
-      platformUrl: agentConfig.platformUrl,
-      billingBase: agentConfig.billingBase,
-      twinId: agentConfig.twinId,
-      twinToken: agentConfig.twinToken,
-      platformKey: agentConfig.platformKey,
-      userId: agentConfig.userId,
-      agentWallets: agentConfig.agentWallets
-    };
+  if (!auth.twinId) {
+    throw new Error("No twin id in .amiko.json. Add amikoTwinId alongside amikoTwinToken.");
   }
-  return { mode: "none" };
+  return auth;
+}
+
+// src/lib/config.ts
+var DEFAULTS = {
+  apiBase: "https://mpp.amikomarkets.com",
+  billingBase: "https://billing.heyamiko.com",
+  platformUrl: "https://platform.heyamiko.com",
+  siteBase: "https://platform.heyamiko.com"
+};
+function loadConfig() {
+  const auth = resolveAuth();
+  return {
+    apiBase: auth.apiBase ?? DEFAULTS.apiBase,
+    billingBase: auth.billingBase ?? DEFAULTS.billingBase,
+    platformUrl: auth.platformUrl ?? DEFAULTS.platformUrl,
+    siteBase: DEFAULTS.siteBase,
+    twinToken: auth.twinToken,
+    twinId: auth.twinId,
+    userId: auth.userId
+  };
 }
 
 // src/lib/format.ts
@@ -17453,164 +17376,27 @@ function renderOutput(data, human, opts = {}) {
   human(data);
 }
 
-// src/onboarding.ts
-var SKIP_COMMANDS = new Set([
-  "help",
-  "--help",
-  "-h",
-  "--version",
-  "-V",
-  "config",
-  "login",
-  "logout",
-  "whoami",
-  "connect",
-  "credits",
-  "swap",
-  "wallet",
-  "bridge",
-  "browse",
-  "call",
-  "update"
-]);
-function prompt(question) {
-  const rl = createInterface({ input: process.stdin, output: process.stdout });
-  return new Promise((resolve2) => {
-    rl.question(question, (answer) => {
-      rl.close();
-      resolve2(answer.trim());
-    });
-  });
-}
-async function runOnboarding(argv) {
-  const cmd = argv[2];
-  if (cmd && SKIP_COMMANDS.has(cmd))
-    return false;
-  const config = loadConfig();
-  if (config.wallet || config.privyToken || config.apiKey || config.twinToken || config.agentWallets?.length)
-    return false;
-  const auth = resolveAuth(config);
-  if (auth.mode !== "none")
-    return false;
-  console.log("");
-  console.log(heading("Welcome to Amiko CLI"));
-  console.log(dim("The AI agent marketplace on Tempo"));
-  console.log("");
-  console.log(dim(`Config: ${getConfigPath()}`));
-  console.log("");
-  console.log(source_default.cyan("1/3") + "  " + source_default.white("Wallet address"));
-  console.log(dim("    Your Tempo/EVM wallet for payments and bridging."));
-  console.log(dim("    Leave blank to skip — you can set it later with: amiko config set wallet <address>"));
-  console.log("");
-  const wallet = await prompt(source_default.dim("  wallet address: "));
-  if (wallet) {
-    saveConfig({ wallet });
-    console.log(success(`Wallet saved: ${wallet.slice(0, 6)}...${wallet.slice(-4)}`));
-  } else {
-    console.log(dim("  Skipped — no wallet set."));
-  }
-  console.log("");
-  console.log(source_default.cyan("2/3") + "  " + source_default.white("Sign in (optional)"));
-  console.log(dim("    Signing in lets you create listings, view earnings, and use auto-pay."));
-  console.log(dim("    Run this anytime: amiko login"));
-  console.log("");
-  const doLogin = await prompt(source_default.dim("  sign in now? [y/N]: "));
-  if (doLogin.toLowerCase() === "y" || doLogin.toLowerCase() === "yes") {
-    console.log("");
-    console.log(dim("  Starting login flow..."));
-    try {
-      execFileSync("amiko", ["login"], { stdio: "inherit" });
-    } catch {
-      console.log(dim("  Login skipped or cancelled."));
-    }
-  } else {
-    console.log(dim("  Skipped — you can sign in later with: amiko login"));
-  }
-  console.log("");
-  console.log(source_default.cyan("3/3") + "  " + source_default.white("You're ready"));
-  console.log("");
-  const final = loadConfig();
-  console.log(label("  MPP service", final.apiBase));
-  if (final.wallet)
-    console.log(label("  Wallet", `${final.wallet.slice(0, 6)}...${final.wallet.slice(-4)}`));
-  if (final.privyToken)
-    console.log(label("  Signed in", "yes"));
-  console.log("");
-  console.log(dim("  Quick start:"));
-  console.log(dim("    amiko browse              Browse live agents"));
-  console.log(dim("    amiko call <agent> <msg>   Call a paid agent"));
-  console.log(dim("    amiko bridge quote 5       Get a bridge quote"));
-  console.log(dim("    amiko wallet balance       Check wallet balance"));
-  console.log("");
-  return true;
-}
-
 // src/commands/config.ts
-var VALID_KEYS = [
-  "apiBase",
-  "billingBase",
-  "siteBase",
-  "platformUrl",
-  "wallet",
-  "apiKey",
-  "privyToken",
-  "userId",
-  "twinId",
-  "twinToken",
-  "connectedKeyId",
-  "connectedKeyName",
-  "connectedKeyPreview"
-];
-function maskKey(key) {
-  if (key.length <= 8)
-    return "****";
-  return key.slice(0, 4) + "..." + key.slice(-4);
-}
 function registerConfigCommand(program2) {
-  const cmd = program2.command("config").description("View or update CLI configuration");
+  const cmd = program2.command("config").description("Show resolved CLI configuration (from .amiko.json)");
   cmd.command("show").description("Show current configuration").action(() => {
     const config = loadConfig();
-    const privyToken = getPrivyToken(config);
     console.log(heading("Amiko CLI Configuration"));
-    console.log(source_default.dim(`File: ${getConfigPath()}
-`));
+    console.log("");
     console.log(heading("Endpoints"));
     console.log(label("  MPP service", config.apiBase));
     console.log(label("  Billing API", config.billingBase));
-    console.log(label("  Marketplace", config.siteBase));
+    console.log(label("  Platform", config.platformUrl));
     console.log("");
     console.log(heading("Identity"));
-    console.log(label("  Wallet", config.wallet || source_default.dim("(not set)")));
-    console.log(label("  Signed in", privyToken ? source_default.green("yes") : source_default.dim("no")));
     console.log(label("  User ID", config.userId || source_default.dim("(not set)")));
-    console.log(label("  Connected Key", config.connectedKeyPreview ? `${config.connectedKeyName || "API key"} (${config.connectedKeyPreview})` : source_default.dim("(not set)")));
-    console.log(label("  API Key", config.apiKey ? maskKey(config.apiKey) : source_default.dim("(not set)")));
-    console.log("");
-    if (!privyToken && !config.apiKey) {
-      console.log(dim("Get started:"));
-      console.log(dim("  amiko login              Sign in with Privy"));
-      console.log(dim("  amiko config set apiKey   Set an API key"));
-    }
-  });
-  cmd.command("set").description("Set a configuration value").argument("<key>", `Config key (${VALID_KEYS.join(", ")})`).argument("<value>", "Config value").action((key, value) => {
-    if (!VALID_KEYS.includes(key)) {
-      console.error(source_default.red(`Invalid key "${key}".`));
-      console.log(source_default.dim(`Valid keys: ${VALID_KEYS.join(", ")}`));
-      process.exit(1);
-    }
-    saveConfig({ [key]: value });
-    console.log(source_default.green(`✓ Set ${key}`));
-  });
-  cmd.command("reset").description("Reset configuration to defaults").action(() => {
-    if (resetConfig()) {
-      console.log(source_default.green("✓ Config reset to defaults"));
-    } else {
-      console.log(source_default.dim("Already at defaults."));
+    console.log(label("  Twin ID", config.twinId || source_default.dim("(not set)")));
+    console.log(label("  Twin Token", config.twinToken ? source_default.green("present") : source_default.dim("(not set)")));
+    if (!config.twinToken) {
+      console.log("");
+      console.log(dim("Place .amiko.json with amikoTwinToken in cwd or any parent."));
     }
   });
-  cmd.command("path").description("Print config file path").action(() => {
-    console.log(getConfigPath());
-  });
 }
 
 // node_modules/ora/index.js
@@ -18495,16 +18281,10 @@ function ora(options) {
 function mppBase() {
   return trimBase(loadConfig().apiBase);
 }
-function authHeaders() {
-  const config = loadConfig();
-  const headers = { "Content-Type": "application/json" };
-  if (config.apiKey) {
-    headers["Authorization"] = `Bearer ${config.apiKey}`;
-  }
-  return headers;
-}
 async function get(path) {
-  const res = await fetch(`${mppBase()}${path}`, { headers: authHeaders() });
+  const res = await fetch(`${mppBase()}${path}`, {
+    headers: { "Content-Type": "application/json" }
+  });
   await assertOk(res);
   return res.json();
 }
@@ -18606,21 +18386,21 @@ function registerDiscoveryCommand(program2) {
 }
 
 // src/lib/tempo.ts
-import { execFile, execFileSync as execFileSync2 } from "node:child_process";
-import { existsSync as existsSync3 } from "node:fs";
-import { homedir as homedir2 } from "node:os";
-import { join as join3 } from "node:path";
-var TEMPO_PATHS = [join3(homedir2(), ".tempo", "bin", "tempo"), "tempo"];
+import { execFile, execFileSync } from "node:child_process";
+import { existsSync as existsSync2 } from "node:fs";
+import { homedir } from "node:os";
+import { join as join2 } from "node:path";
+var TEMPO_PATHS = [join2(homedir(), ".tempo", "bin", "tempo"), "tempo"];
 function findTempo() {
   for (const p of TEMPO_PATHS) {
     if (p === "tempo") {
       try {
-        execFileSync2(p, ["--version"], { stdio: "pipe", timeout: 3000 });
+        execFileSync(p, ["--version"], { stdio: "pipe", timeout: 3000 });
         return p;
       } catch {
         continue;
       }
-    } else if (existsSync3(p)) {
+    } else if (existsSync2(p)) {
       return p;
     }
   }
@@ -18867,10 +18647,10 @@ function registerBridgeCommand(program2) {
       const inputToken = getUsdcAddress(originChainId);
       const outputToken = getUsdcAddress(destChainId);
       const amount = parseUsdcAmount(amountStr);
-      const depositor = opts.depositor || loadConfig().wallet;
+      const depositor = opts.depositor;
       if (!depositor) {
         spinner.stop();
-        console.error(error("No depositor address. Provide --depositor or set wallet: amiko config set wallet <address>"));
+        console.error(error("No depositor address. Provide --depositor <address>."));
         process.exit(1);
       }
       const isCrossEcosystem = originChainId === CHAINS.solana !== (destChainId === CHAINS.solana);
@@ -18935,10 +18715,10 @@ function registerBridgeCommand(program2) {
       const inputToken = getUsdcAddress(originChainId);
       const outputToken = getUsdcAddress(destChainId);
       const amount = parseUsdcAmount(amountStr);
-      const depositor = opts.depositor || loadConfig().wallet;
+      const depositor = opts.depositor;
       if (!depositor) {
         spinner.stop();
-        console.error(error("No depositor address. Provide --depositor or set wallet: amiko config set wallet <address>"));
+        console.error(error("No depositor address. Provide --depositor <address>."));
         process.exit(1);
       }
       const isCrossEcosystem = originChainId === CHAINS.solana !== (destChainId === CHAINS.solana);
@@ -19205,11 +18985,9 @@ function baseUrl(auth) {
   return url.replace(/\/$/, "");
 }
 function authHeader(auth) {
-  if (auth.privyToken)
-    return `Bearer am-${auth.privyToken}`;
   if (auth.twinToken)
     return `Bearer ${auth.twinToken}`;
-  throw new Error("No amiko-web auth available. Run `amiko login` to link your account.");
+  throw new Error("No twin token found. Place an .amiko.json file with amikoTwinToken in the current directory or any parent.");
 }
 async function amikoWebFetch(auth, path, opts = {}) {
   const url = new URL(`${baseUrl(auth)}${path}`);
@@ -19275,6 +19053,34 @@ function formatError(status, body, path) {
   return `${prefix}: ${snippet}`;
 }
 
+// src/lib/balance.ts
+async function fetchCreditsBalance(auth) {
+  if (!auth.twinToken)
+    return null;
+  const base = (auth.billingBase || "https://billing.heyamiko.com").replace(/\/$/, "");
+  try {
+    const res = await fetch(`${base}/api/credits`, {
+      headers: { Authorization: `Bearer ${auth.twinToken}` }
+    });
+    if (!res.ok)
+      return null;
+    const data = await res.json();
+    const raw = data.displayBalance ?? Number(data.credits?.balance ?? 0);
+    return typeof raw === "number" && isFinite(raw) ? Math.round(raw) : null;
+  } catch {
+    return null;
+  }
+}
+async function printBalanceRemaining(auth) {
+  const balance = await fetchCreditsBalance(auth);
+  if (balance == null) {
+    console.log(dim("Balance: (could not fetch)"));
+    return;
+  }
+  const usd2 = (balance / 1e4).toFixed(2);
+  console.log(label("Balance", `${balance.toLocaleString()} credits (~$${usd2})`));
+}
+
 // src/lib/mpp-topup.ts
 async function mppCreditsTopup(params) {
   const config2 = loadConfig();
@@ -19302,9 +19108,6 @@ async function mppCreditsTopup(params) {
   } catch {
     try {
       const headers = { "Content-Type": "application/json" };
-      if (config2.apiKey) {
-        headers["Authorization"] = `Bearer ${config2.apiKey}`;
-      }
       const res = await fetch(`${base}/v1/credits/topup`, {
         method: "POST",
         headers,
@@ -19337,9 +19140,8 @@ async function mppCreditsTopup(params) {
 
 // src/commands/credits.ts
 function promptYesNo2(question) {
-  if (!process.stdin.isTTY) {
+  if (!process.stdin.isTTY)
     return Promise.resolve(false);
-  }
   const rl = readline2.createInterface({
     input: process.stdin,
     output: process.stdout
@@ -19353,114 +19155,25 @@ function promptYesNo2(question) {
 }
 function registerCreditsCommand(program2) {
   const credits = program2.command("credits").description("Manage Amiko credit balance and top-ups");
-  credits.command("balance").description("Show credit balance and agent wallet balances").action(async () => {
-    const spinner = ora("Fetching balances...").start();
-    try {
-      const auth = resolveAuth(loadConfig());
-      if (auth.mode === "none") {
-        spinner.stop();
-        console.error(error("Not authenticated. Check .amiko.json credentials."));
-        process.exit(1);
-      }
-      spinner.stop();
-      console.log(heading("Credits"));
-      console.log("");
-      {
-        const spinner2 = ora("Fetching credit balance...").start();
-        try {
-          let balance = null;
-          const billingToken = auth.platformKey || auth.twinToken || auth.privyToken;
-          const base = auth.billingBase || "https://billing.heyamiko.com";
-          if (billingToken) {
-            try {
-              const res = await fetch(`${base}/api/credits`, {
-                headers: {
-                  Authorization: `Bearer ${billingToken}`
-                }
-              });
-              if (res.ok) {
-                const data = await res.json();
-                balance = data.displayBalance ?? Math.round(Number(data.credits?.balance || 0));
-              } else {
-                console.log(dim(`  API returned ${res.status}: ${await res.text().catch(() => "")}`));
-              }
-            } catch (e) {
-              console.log(dim(`  Fetch error: ${e.message}`));
-            }
-          } else {
-            console.log(dim("  No auth token available"));
-          }
-          spinner2.stop();
-          if (balance !== null) {
-            console.log(label("Balance", source_default.bold(balance.toLocaleString()) + " credits"));
-            console.log("");
-          } else {
-            console.log(dim("  Could not fetch credit balance"));
-            console.log("");
-          }
-        } catch (err) {
-          spinner2.stop();
-          console.error(error(err instanceof Error ? err.message : "Failed to fetch credit balance"));
-        }
-      }
-      const agentWallets = (auth.agentWallets || []).filter((w) => w.source === "agent");
-      if (agentWallets.length > 0) {
-        const spinner3 = ora("Fetching wallet balances...").start();
-        try {
-          spinner3.stop();
-          console.log(label("Agent Wallets", ""));
-          for (const w of agentWallets) {
-            const addr = w.address || "";
-            const chain = w.chain || "solana";
-            const isEvm = [
-              "base",
-              "ethereum",
-              "tempo"
-            ].includes(chain);
-            const chainLabel = isEvm ? "EVM (Ethereum · Base · Tempo)" : chain.charAt(0).toUpperCase() + chain.slice(1);
-            const shortAddr = addr || "";
-            console.log(`  ${source_default.bold(chainLabel)} ${dim(shortAddr)}`);
-            if (!auth.twinId) {
-              console.log(dim("    (no twin id for balance fetch)"));
-              continue;
-            }
-            try {
-              const balData = await amikoWebFetch(auth, `/api/agents/${encodeURIComponent(auth.twinId)}/wallets/${encodeURIComponent(addr)}/balance`);
-              if (balData.chains) {
-                for (const [chainName, chainBals] of Object.entries(balData.chains)) {
-                  const rows = Object.entries(chainBals).filter(([, t]) => parseFloat(t.amount) > 0);
-                  if (rows.length === 0)
-                    continue;
-                  console.log(dim(`    ${chainName}`));
-                  for (const [token, tData] of rows) {
-                    const human = parseFloat(tData.amount) / Math.pow(10, tData.decimals);
-                    console.log(dim(`      ${token.padEnd(10)} ${human.toFixed(6)}`));
-                  }
-                }
-              } else {
-                for (const [token, tData] of Object.entries(balData.balances || {})) {
-                  const human = parseFloat(tData.amount) / Math.pow(10, tData.decimals);
-                  console.log(dim(`    ${token.padEnd(10)} ${human.toFixed(6)}`));
-                }
-              }
-            } catch (e) {
-              const msg = e instanceof Error ? e.message : String(e);
-              console.log(dim(`    (balance fetch failed: ${msg.slice(0, 80)})`));
-            }
-          }
-          console.log("");
-        } catch (err) {
-          spinner3.stop();
-          console.error(error(err instanceof Error ? err.message : "Failed to fetch wallet balances"));
-        }
-      }
-    } catch (err) {
-      spinner.stop();
-      console.error(error(err instanceof Error ? err.message : "Failed to fetch balances"));
+  credits.command("balance").description("Show credit balance").action(async () => {
+    const auth = resolveAuth();
+    if (!auth.twinToken) {
+      console.error(error("Not authenticated. Place .amiko.json with amikoTwinToken in cwd or any parent."));
       process.exit(1);
     }
+    const spinner = ora("Fetching balance...").start();
+    const balance = await fetchCreditsBalance(auth);
+    spinner.stop();
+    console.log(heading("Credits"));
+    console.log("");
+    if (balance == null) {
+      console.log(dim("  Could not fetch credit balance"));
+      return;
+    }
+    const usd2 = (balance / 1e4).toFixed(2);
+    console.log(label("Balance", `${source_default.bold(balance.toLocaleString())} credits (~$${usd2})`));
   });
-  credits.command("topup [amount]").description("Top up credits by spending tokens from your agent wallet. <amount> is in credits (10,000 = $1.00). Use --usd <n> to specify dollars, or --spend <n> to specify a token amount (e.g. 1 SOL worth).").option("--token <TOKEN>", "Token to use for top-up").option("--chain <CHAIN>", "Chain to use for top-up").option("--wallet <ADDR>", "Wallet address to use").option("--method <METHOD>", "Payment method: auto, crossmint, mpp", "auto").option("--usd <amount>", "Amount in USD instead of credits (e.g. --usd 1 for $1 = 10,000 credits)").option("--spend <amount>", "Spend this many units of --token and convert to credits at current price (e.g. --spend 1 --token SOL for '1 SOL worth of credits')").option("--yes", "Skip the interactive Proceed? prompt (summary still prints)").action(async (amountStr, options) => {
+  credits.command("topup [amount]").description("Top up credits by spending tokens from your agent wallet. <amount> is in credits (10,000 = $1.00). Use --usd <n> to specify dollars, or --spend <n> to specify a token amount (e.g. 1 SOL worth).").option("--token <TOKEN>", "Token to use for top-up").option("--chain <CHAIN>", "Chain to use for top-up").option("--wallet <ADDR>", "Wallet address to use").option("--method <METHOD>", "Payment method: auto, crossmint, mpp", "auto").option("--key-id <ID>", "Platform API key ID (required for --method mpp)").option("--usd <amount>", "Amount in USD instead of credits (e.g. --usd 1 = 10,000 credits)").option("--spend <amount>", "Spend this many units of --token and convert to credits at current price").option("--yes", "Skip the interactive Proceed? prompt").action(async (amountStr, options) => {
     const inputs = [amountStr, options.usd, options.spend].filter((v) => v != null && v !== "");
     if (inputs.length !== 1) {
       console.error(error("Specify exactly one of: <amount> (credits), --usd <dollars>, or --spend <token amount>."));
@@ -19495,224 +19208,152 @@ function registerCreditsCommand(program2) {
       }
       presetCredits = credits2;
     }
-    const spinner = ora("Resolving auth...").start();
+    let auth;
     try {
-      const auth = resolveAuth(loadConfig());
-      if (auth.mode === "none") {
-        spinner.stop();
-        console.error(error("Not authenticated. Check .amiko.json credentials."));
-        process.exit(1);
-      }
-      const billingBase = auth.billingBase || "https://billing.heyamiko.com";
-      if (!billingBase) {
-        spinner.stop();
-        console.error(error("Billing service not configured. Check billingBase in .amiko.json."));
-        process.exit(1);
-      }
-      const authToken = auth.platformKey || auth.twinToken || auth.privyToken;
-      if (!authToken) {
-        spinner.stop();
-        console.error(error("No API key or auth token. Check platformKey in .amiko.json."));
-        process.exit(1);
-      }
-      const authHeaders2 = {
-        Authorization: `Bearer ${authToken}`,
-        "Content-Type": "application/json"
-      };
-      spinner.stop();
-      const token = options.token || "AMIKO";
-      const stablecoins = ["usdc", "usdt", "usdc.e", "usdt0"];
-      const isStable = stablecoins.includes(token.toLowerCase());
-      let pricePerToken = null;
-      if (isStable) {
-        pricePerToken = 1;
-      } else {
-        const spinner2 = ora(`Fetching ${token} price...`).start();
-        try {
-          const MINTS = {
-            AMIKO: "AY1Ww6MxwC3cCiyrandHqLrp4FXvzgcwQTZpJ2FEpump",
-            SOL: "So11111111111111111111111111111111111111112"
-          };
-          const USDC_MINT = "EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v";
-          const mint = MINTS[token.toUpperCase()];
-          if (!mint) {
-            spinner2.stop();
-            console.error(error(`Unknown token: ${token}`));
-            process.exit(1);
-          }
-          const decimals = token.toUpperCase() === "SOL" ? 9 : 6;
-          const oneToken = Math.pow(10, decimals).toString();
-          const jupRes = await fetch(`https://lite-api.jup.ag/swap/v1/quote?inputMint=${mint}&outputMint=${USDC_MINT}&amount=${oneToken}&slippageBps=100`);
-          if (!jupRes.ok) {
-            spinner2.stop();
-            console.error(error("Failed to fetch token price"));
-            process.exit(1);
-          }
-          const jupData = await jupRes.json();
-          pricePerToken = parseFloat(jupData.outAmount) / 1e6;
+      auth = requireAuth();
+    } catch (e) {
+      console.error(error(e instanceof Error ? e.message : "auth failed"));
+      process.exit(1);
+    }
+    const token = options.token || "AMIKO";
+    const stablecoins = ["usdc", "usdt", "usdc.e", "usdt0"];
+    const isStable = stablecoins.includes(token.toLowerCase());
+    let pricePerToken = null;
+    if (isStable) {
+      pricePerToken = 1;
+    } else {
+      const spinner2 = ora(`Fetching ${token} price...`).start();
+      try {
+        const MINTS = {
+          AMIKO: "AY1Ww6MxwC3cCiyrandHqLrp4FXvzgcwQTZpJ2FEpump",
+          SOL: "So11111111111111111111111111111111111111112"
+        };
+        const USDC_MINT = "EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v";
+        const mint = MINTS[token.toUpperCase()];
+        if (!mint) {
           spinner2.stop();
-        } catch {
+          console.error(error(`Unknown token: ${token}`));
+          process.exit(1);
+        }
+        const decimals = token.toUpperCase() === "SOL" ? 9 : 6;
+        const oneToken = Math.pow(10, decimals).toString();
+        const jupRes = await fetch(`https://lite-api.jup.ag/swap/v1/quote?inputMint=${mint}&outputMint=${USDC_MINT}&amount=${oneToken}&slippageBps=100`);
+        if (!jupRes.ok) {
           spinner2.stop();
           console.error(error("Failed to fetch token price"));
           process.exit(1);
         }
-      }
-      let creditsAmount;
-      let usdAmount;
-      let tokenAmount;
-      if (presetSpend != null) {
-        tokenAmount = presetSpend;
-        usdAmount = tokenAmount * pricePerToken;
-        creditsAmount = Math.round(usdAmount * 1e4);
-      } else if (presetUsd != null) {
-        usdAmount = presetUsd;
-        creditsAmount = Math.round(usdAmount * 1e4);
-        tokenAmount = usdAmount / pricePerToken;
-      } else {
-        creditsAmount = presetCredits;
-        usdAmount = creditsAmount / 1e4;
-        tokenAmount = usdAmount / pricePerToken;
-      }
-      if (options.method === "mpp" && auth.userId && auth.connectedKeyId) {
-        if (!options.yes) {
-          console.log(heading("Top-up Summary (MPP)"));
-          console.log("");
-          console.log(label("Credits", creditsAmount.toLocaleString()));
-          console.log(label("USD", `$${usdAmount.toFixed(2)}`));
-          console.log(dim("Charged via MPP connected key."));
-          console.log("");
-          const ok = await promptYesNo2("Proceed? [y/N] ");
-          if (!ok) {
-            console.log(dim("Top-up cancelled."));
-            process.exit(0);
-          }
-          console.log("");
-        }
-        const spinner2 = ora("Topping up credits via MPP...").start();
-        const mppResult = await mppCreditsTopup({
-          userId: auth.userId,
-          keyId: auth.connectedKeyId,
-          amount: usdAmount
-        });
+        const jupData = await jupRes.json();
+        pricePerToken = parseFloat(jupData.outAmount) / 1e6;
         spinner2.stop();
-        if (!mppResult.success) {
-          console.error(error(mppResult.error || "MPP top-up failed"));
-          process.exit(1);
-        }
-        console.log(heading("Top-up Complete (MPP)"));
-        console.log("");
-        if (mppResult.credits?.balance)
-          console.log(label("Balance", String(mppResult.credits.balance)));
-        console.log(success("Credits topped up via MPP."));
-        return;
+      } catch {
+        spinner2.stop();
+        console.error(error("Failed to fetch token price"));
+        process.exit(1);
       }
-      const agentWallet = auth.agentWallets?.find((w) => w.source === "agent");
-      const walletAddr = options.wallet || agentWallet?.address || auth.agentWallets?.[0]?.address;
-      const walletChain = options.chain || auth.agentWallets?.find((w) => w.address === walletAddr)?.chain || "solana";
-      if (!walletAddr) {
-        console.error(error("No wallet found. Specify --wallet <address>"));
+    }
+    let creditsAmount;
+    let usdAmount;
+    let tokenAmount;
+    if (presetSpend != null) {
+      tokenAmount = presetSpend;
+      usdAmount = tokenAmount * pricePerToken;
+      creditsAmount = Math.round(usdAmount * 1e4);
+    } else if (presetUsd != null) {
+      usdAmount = presetUsd;
+      creditsAmount = Math.round(usdAmount * 1e4);
+      tokenAmount = usdAmount / pricePerToken;
+    } else {
+      creditsAmount = presetCredits;
+      usdAmount = creditsAmount / 1e4;
+      tokenAmount = usdAmount / pricePerToken;
+    }
+    if (options.method === "mpp") {
+      if (!auth.userId) {
+        console.error(error("--method mpp requires amikoUserId in .amiko.json."));
         process.exit(1);
       }
-      const shortWallet = walletAddr.length > 12 ? `${walletAddr.slice(0, 6)}...${walletAddr.slice(-4)}` : walletAddr;
-      console.log(heading("Top-up Summary"));
-      console.log("");
-      console.log(label("Credits", creditsAmount.toLocaleString()));
-      console.log(label("Cost", `${tokenAmount.toFixed(6)} ${token} (~$${usdAmount.toFixed(2)})`));
-      if (pricePerToken && pricePerToken !== 1) {
-        console.log(label("Price", `1 ${token} = $${pricePerToken.toFixed(4)}`));
+      if (!options.keyId) {
+        console.error(error("--method mpp requires --key-id <platformKeyId>."));
+        process.exit(1);
       }
-      console.log(label("From", `wallet ${shortWallet} (${walletChain})`));
-      console.log(dim("Tokens will be transferred from your agent wallet to the treasury."));
-      console.log("");
       if (!options.yes) {
-        const confirmed = await promptYesNo2("Proceed? [y/N] ");
-        if (!confirmed) {
+        console.log(heading("Top-up Summary (MPP)"));
+        console.log("");
+        console.log(label("Credits", creditsAmount.toLocaleString()));
+        console.log(label("USD", `$${usdAmount.toFixed(2)}`));
+        console.log(dim("Charged via MPP connected key."));
+        console.log("");
+        const ok = await promptYesNo2("Proceed? [y/N] ");
+        if (!ok) {
           console.log(dim("Top-up cancelled."));
           process.exit(0);
         }
         console.log("");
       }
-      if (["base", "ethereum", "tempo"].includes(walletChain)) {
-        console.error(error("EVM topup not supported yet. Use a Solana wallet with --token AMIKO, USDC, USDT, or SOL."));
-        process.exit(1);
-      }
-      const TREASURY = "FPiZAf3jEnNfCwfvbv46jdPfHbmSepD4Q6iHiLJDQXvb";
-      const spinner3 = ora("Transferring tokens to treasury...").start();
-      const transferRes = await fetch(`${auth.billingBase || "https://billing.heyamiko.com"}/api/crossmint/wallets/${encodeURIComponent(walletAddr)}/transfer`, {
-        method: "POST",
-        headers: authHeaders2,
-        body: JSON.stringify({
-          to: TREASURY,
-          amount: tokenAmount.toFixed(6),
-          token,
-          chain: walletChain
-        })
+      const spinner2 = ora("Topping up credits via MPP...").start();
+      const mppResult = await mppCreditsTopup({
+        userId: auth.userId,
+        keyId: options.keyId,
+        amount: usdAmount
       });
-      if (!transferRes.ok) {
-        spinner3.stop();
-        const err = await transferRes.json().catch(() => ({ error: "Transfer failed" }));
-        console.error(error(err.error || `Transfer failed: ${transferRes.status}`));
-        if (err.details) {
-          console.error(dim(typeof err.details === "string" ? err.details : JSON.stringify(err.details)));
-        }
-        process.exit(1);
-      }
-      const transferData = await transferRes.json();
-      const txHash = transferData.txHash;
-      spinner3.stop();
-      if (!txHash) {
-        console.error(error("Transfer sent but no transaction hash returned."));
+      spinner2.stop();
+      if (!mppResult.success) {
+        console.error(error(mppResult.error || "MPP top-up failed"));
         process.exit(1);
       }
-      console.log(label("Tx Hash", dim(txHash.slice(0, 16) + "...")));
-      let keyId = auth.connectedKeyId;
-      if (!keyId && authToken) {
-        try {
-          const keysRes = await fetch(`${auth.billingBase || "https://billing.heyamiko.com"}/api/user/keys`, { headers: { Authorization: `Bearer ${authToken}` } });
-          if (keysRes.ok) {
-            const keysData = await keysRes.json();
-            const active = keysData.keys?.find((k) => k.isActive !== false);
-            if (active)
-              keyId = active.id;
-          }
-        } catch {}
-      }
-      if (!keyId) {
-        console.log(warn("No API key found — transfer sent but credits not verified."));
-        console.log(dim(`Tx: ${txHash}`));
+      console.log(heading("Top-up Complete (MPP)"));
+      console.log("");
+      if (mppResult.credits?.balance)
+        console.log(label("Balance", String(mppResult.credits.balance)));
+      console.log(success("Credits topped up via MPP."));
+      return;
+    }
+    console.log(heading("Top-up Summary"));
+    console.log("");
+    console.log(label("Credits", creditsAmount.toLocaleString()));
+    console.log(label("Cost", `${tokenAmount.toFixed(6)} ${token} (~$${usdAmount.toFixed(2)})`));
+    if (pricePerToken && pricePerToken !== 1) {
+      console.log(label("Price", `1 ${token} = $${pricePerToken.toFixed(4)}`));
+    }
+    if (options.wallet) {
+      console.log(label("From", `wallet ${options.wallet} (${options.chain || "solana"})`));
+    } else {
+      console.log(dim("Platform will select an agent wallet on your behalf."));
+    }
+    console.log("");
+    if (!options.yes) {
+      const ok = await promptYesNo2("Proceed? [y/N] ");
+      if (!ok) {
+        console.log(dim("Top-up cancelled."));
         process.exit(0);
       }
-      const spinner4 = ora("Verifying and crediting...").start();
-      const verifyRes = await fetch(`${auth.billingBase || "https://billing.heyamiko.com"}/api/user/keys/${keyId}/topup/wallet`, {
-        method: "POST",
-        headers: authHeaders2,
-        body: JSON.stringify({
-          txSignature: txHash,
-          amount: tokenAmount,
-          token: token.toUpperCase()
-        })
-      });
-      spinner4.stop();
-      if (!verifyRes.ok) {
-        const err = await verifyRes.json().catch(() => ({ error: "Verify failed" }));
-        console.error(error(err.error || "Transfer sent but credit verification failed."));
-        console.log(dim(`Tx: ${txHash}`));
-        process.exit(1);
-      }
-      const verifyData = await verifyRes.json();
+      console.log("");
+    }
+    const spinner = ora("Submitting top-up to platform...").start();
+    try {
+      const body = { credits: creditsAmount, token };
+      if (options.chain)
+        body.chain = options.chain;
+      if (options.wallet)
+        body.walletAddress = options.wallet;
+      const res = await amikoWebFetch(auth, `/api/agents/${encodeURIComponent(auth.twinId)}/credits/topup`, { method: "POST", body });
+      spinner.stop();
       console.log(heading("Top-up Complete"));
       console.log("");
       console.log(label("Credits", source_default.bold(creditsAmount.toLocaleString())));
       console.log(label("Token", `${tokenAmount.toFixed(6)} ${token}`));
       console.log(label("USD", `$${usdAmount.toFixed(2)}`));
-      if (verifyData.credits?.balance) {
-        console.log(label("Balance", source_default.bold(Number(verifyData.credits.balance).toLocaleString())));
+      if (res.txHash)
+        console.log(label("Tx", dim(res.txHash.slice(0, 16) + "...")));
+      if (res.credits?.balance != null) {
+        console.log(label("Balance", source_default.bold(Number(res.credits.balance).toLocaleString())));
       }
       console.log("");
       console.log(success("Credits topped up."));
-    } catch (err) {
+    } catch (e) {
       spinner.stop();
-      console.error(error(err instanceof Error ? err.message : "Failed to top up credits"));
+      console.error(error(e instanceof Error ? e.message : "Top-up failed"));
       process.exit(1);
     }
   });
@@ -19833,17 +19474,16 @@ function registerSwapCommand(program2) {
   });
   cmd.command("send").description("Execute a token swap on Solana via Crossmint wallet").argument("<amount>", "Amount to swap (e.g., 5, 0.1)").argument("<from>", "Input token (sol, usdc, usdt, amiko, bonk, or mint address)").argument("<to>", "Output token (sol, usdc, usdt, amiko, bonk, or mint address)").option("--wallet <address>", "Wallet address (uses config wallet by default)").option("--slippage <bps>", "Slippage tolerance in basis points", "50").option("--yes", "Skip confirmation").action(async (amountStr, fromToken, toToken, opts) => {
     try {
-      const config2 = loadConfig();
-      const auth = resolveAuth(config2);
-      if (auth.mode === "none") {
-        console.error(error("Not authenticated. Check .amiko.json credentials."));
+      let auth;
+      try {
+        auth = requireAuth();
+      } catch (e) {
+        console.error(error(e instanceof Error ? e.message : "auth failed"));
         process.exit(1);
       }
-      const allWallets = auth.agentWallets || config2.agentWallets || [];
-      const solanaAgentWallet = allWallets.find((w) => w.chain === "solana")?.address;
-      const wallet = opts.wallet || solanaAgentWallet || config2.wallet;
+      const wallet = opts.wallet;
       if (!wallet) {
-        console.error(error("No Solana wallet found. Provide --wallet <address>"));
+        console.error(error("No Solana wallet specified. Provide --wallet <address>."));
         process.exit(1);
       }
       const input = resolveToken(fromToken);
@@ -19876,39 +19516,24 @@ function registerSwapCommand(program2) {
         yes: opts.yes,
         commandExample: `amiko swap send ${amountStr} ${fromToken} ${toToken}`
       });
-      const swapSpinner = ora("Executing swap via Crossmint...").start();
-      const billingToken = auth.platformKey || auth.twinToken || auth.privyToken;
-      const billingBase = auth.billingBase || "https://billing.heyamiko.com";
-      if (!billingToken) {
+      const swapSpinner = ora("Executing swap via platform...").start();
+      let swapData;
+      try {
+        swapData = await amikoWebFetch(auth, `/api/agents/${encodeURIComponent(auth.twinId)}/wallets/${encodeURIComponent(wallet)}/swap`, {
+          method: "POST",
+          body: {
+            inputMint: input.mint,
+            outputMint: output.mint,
+            amount: amount2,
+            slippageBps: parseInt(opts.slippage)
+          }
+        });
         swapSpinner.stop();
-        console.error(error("No auth token available for swap"));
-        process.exit(1);
-      }
-      const swapRes = await fetch(`${billingBase}/api/crossmint/wallets/${encodeURIComponent(wallet)}/swap`, {
-        method: "POST",
-        headers: {
-          "Content-Type": "application/json",
-          Authorization: `Bearer ${billingToken}`
-        },
-        body: JSON.stringify({
-          inputMint: input.mint,
-          outputMint: output.mint,
-          amount: amount2,
-          slippageBps: parseInt(opts.slippage),
-          quoteResponse: quote
-        })
-      });
-      if (!swapRes.ok) {
+      } catch (e) {
         swapSpinner.stop();
-        const err = await swapRes.json().catch(() => ({ error: "Swap failed" }));
-        console.error(error(err.error || `Swap failed: ${swapRes.status}`));
-        if (err.details) {
-          console.error(dim(typeof err.details === "string" ? err.details : JSON.stringify(err.details)));
-        }
+        console.error(error(e instanceof Error ? e.message : "Swap failed"));
         process.exit(1);
       }
-      const swapData = await swapRes.json();
-      swapSpinner.stop();
       console.log(success("Swap executed"));
       console.log("");
       if (swapData.txHash) {
@@ -19946,12 +19571,12 @@ function registerSwapCommand(program2) {
 }
 
 // src/commands/update.ts
-import { execFileSync as execFileSync3 } from "node:child_process";
+import { execFileSync as execFileSync2 } from "node:child_process";
 import fs from "node:fs";
 import path from "node:path";
 function detectPackageManager() {
   try {
-    execFileSync3("bun", ["--version"], { stdio: "ignore" });
+    execFileSync2("bun", ["--version"], { stdio: "ignore" });
     return "bun";
   } catch {
     return "npm";
@@ -19974,7 +19599,7 @@ function syncTwinInstall() {
   if (!src)
     return false;
   fs.rmSync(DATA_CLI, { recursive: true, force: true });
-  execFileSync3("cp", ["-rL", src, DATA_CLI]);
+  execFileSync2("cp", ["-rL", src, DATA_CLI]);
   try {
     fs.unlinkSync(BIN_TARGET);
   } catch {}
@@ -20006,11 +19631,11 @@ function registerUpdateCommand(program2) {
     const spinner = ora("Installing latest version...").start();
     try {
       if (pm === "bun") {
-        execFileSync3("bun", ["install", "-g", `${pkg}@latest`], {
+        execFileSync2("bun", ["install", "-g", `${pkg}@latest`], {
           stdio: "pipe"
         });
       } else {
-        execFileSync3("npm", ["install", "-g", `${pkg}@latest`], {
+        execFileSync2("npm", ["install", "-g", `${pkg}@latest`], {
           stdio: "pipe"
         });
       }
@@ -20028,7 +19653,7 @@ function registerUpdateCommand(program2) {
       }
       let newVersion = "latest";
       try {
-        newVersion = execFileSync3("amiko", ["--version"], {
+        newVersion = execFileSync2("amiko", ["--version"], {
           encoding: "utf-8"
         }).trim();
       } catch {}
@@ -20048,35 +19673,6 @@ function registerUpdateCommand(program2) {
   });
 }
 
-// src/lib/balance.ts
-async function fetchCreditsBalance(auth) {
-  const billingToken = auth.platformKey || auth.twinToken || auth.privyToken;
-  if (!billingToken)
-    return null;
-  const base = (auth.billingBase || "https://billing.heyamiko.com").replace(/\/$/, "");
-  try {
-    const res = await fetch(`${base}/api/credits`, {
-      headers: { Authorization: `Bearer ${billingToken}` }
-    });
-    if (!res.ok)
-      return null;
-    const data = await res.json();
-    const raw = data.displayBalance ?? Number(data.credits?.balance ?? 0);
-    return typeof raw === "number" && isFinite(raw) ? Math.round(raw) : null;
-  } catch {
-    return null;
-  }
-}
-async function printBalanceRemaining(auth) {
-  const balance = await fetchCreditsBalance(auth);
-  if (balance == null) {
-    console.log(dim("Balance: (could not fetch)"));
-    return;
-  }
-  const usd2 = (balance / 1e4).toFixed(2);
-  console.log(label("Balance", `${balance.toLocaleString()} credits (~$${usd2})`));
-}
-
 // src/lib/errors.ts
 async function reportHttpError(res, label2) {
   const text = await res.text().catch(() => "");
@@ -20095,7 +19691,7 @@ async function reportHttpError(res, label2) {
 // src/commands/search.ts
 var TREASURY = "FPiZAf3jEnNfCwfvbv46jdPfHbmSepD4Q6iHiLJDQXvb";
 function registerSearchCommand(program2) {
-  program2.command("search <query>").description("X Search — pays 1 AMIKO token per search").option("--raw", "Output raw JSON").option("--token <token>", "Payment token (AMIKO, USDC, SOL)", "AMIKO").option("--yes", "Skip the pre-spend confirmation (required in non-interactive shells)").action(async (query, opts) => {
+  program2.command("search <query>").description("X Search — pays 1 AMIKO token per search").option("--raw", "Output raw JSON").option("--token <token>", "Payment token (AMIKO, USDC, SOL)", "AMIKO").option("--wallet <address>", "Solana wallet address to pay from (required)").option("--yes", "Skip the pre-spend confirmation (required in non-interactive shells)").action(async (query, opts) => {
     await requireApproval({
       cost: `1 ${opts.token || "AMIKO"}`,
       summary: `X/Twitter search: ${query.slice(0, 80)}${query.length > 80 ? "…" : ""}`,
@@ -20105,54 +19701,40 @@ function registerSearchCommand(program2) {
     const spinner = ora("X Search...").start();
     try {
       const config2 = loadConfig();
-      const auth = resolveAuth(config2);
-      const mppBase2 = (config2.apiBase || "https://mpp.amikomarkets.com").replace(/\/$/, "");
-      const billingBase = auth.billingBase || "https://billing.heyamiko.com";
-      const billingToken = auth.platformKey || auth.twinToken || auth.privyToken;
-      if (auth.mode === "none" || !billingToken) {
-        spinner.stop();
-        console.error(error("Not authenticated. Check .amiko.json has valid credentials."));
-        process.exit(1);
-      }
-      const allWallets = auth.agentWallets || config2.agentWallets || [];
-      const solanaWallet = allWallets.find((w) => w.chain === "solana")?.address;
-      const evmWallet = allWallets.find((w) => w.chain === "base" || w.chain === "evm" || w.chain === "tempo")?.address;
-      if (!solanaWallet && !evmWallet) {
+      let auth;
+      try {
+        auth = requireAuth();
+      } catch (e) {
         spinner.stop();
-        console.error(error("No wallet found. Your twin needs a Solana or EVM wallet."));
-        console.log(dim("  Re-init your twin from the Amiko dashboard to provision wallets."));
+        console.error(error(e instanceof Error ? e.message : "auth failed"));
         process.exit(1);
       }
-      const payWithSolana = !!solanaWallet;
-      const wallet = payWithSolana ? solanaWallet : evmWallet;
-      const chain = payWithSolana ? "solana" : "base";
-      const token = payWithSolana ? opts.token || "AMIKO" : "USDC";
+      const mppBase2 = (config2.apiBase || "https://mpp.amikomarkets.com").replace(/\/$/, "");
+      const token = opts.token || "AMIKO";
+      const chain = "solana";
       const amount2 = token === "AMIKO" ? "1" : "0.01";
-      spinner.text = `Paying ${amount2} ${token} (${chain})...`;
-      const transferRes = await fetch(`${billingBase}/api/crossmint/wallets/${encodeURIComponent(wallet)}/transfer`, {
-        method: "POST",
-        headers: {
-          "Content-Type": "application/json",
-          Authorization: `Bearer ${billingToken}`
-        },
-        body: JSON.stringify({
-          to: TREASURY,
-          amount: amount2,
-          token,
-          chain
-        })
-      });
-      if (!transferRes.ok) {
+      const wallet = opts.wallet;
+      if (!wallet) {
         spinner.stop();
-        const err = await transferRes.json().catch(() => ({ error: "Transfer failed" }));
-        console.error(error(err.error || `${token} payment failed: ${transferRes.status}`));
+        console.error(error("Provide --wallet <address> to pay from."));
         process.exit(1);
       }
-      const transferData = await transferRes.json();
-      const txHash = transferData.txHash;
-      if (!txHash) {
+      spinner.text = `Paying ${amount2} ${token} (${chain})...`;
+      let txHash;
+      try {
+        const transferData = await amikoWebFetch(auth, `/api/agents/${encodeURIComponent(auth.twinId)}/wallets/${encodeURIComponent(wallet)}/transfer`, {
+          method: "POST",
+          body: { to: TREASURY, amount: amount2, token, chain }
+        });
+        if (!transferData.txHash) {
+          spinner.stop();
+          console.error(error("Payment sent but no tx hash returned."));
+          process.exit(1);
+        }
+        txHash = transferData.txHash;
+      } catch (e) {
         spinner.stop();
-        console.error(error("Payment sent but no tx hash returned."));
+        console.error(error(e instanceof Error ? e.message : `${token} payment failed`));
         process.exit(1);
       }
       spinner.text = `Paid ${amount2} ${token} — searching X...`;
@@ -20208,12 +19790,12 @@ function registerSearchCommand(program2) {
 // src/commands/image.ts
 var TREASURY2 = "FPiZAf3jEnNfCwfvbv46jdPfHbmSepD4Q6iHiLJDQXvb";
 function registerImageCommand(program2) {
-  program2.command("image <prompt>").alias("img").description("Generate an image — costs 5 AMIKO").option("--size <size>", "Image size: 1024x1024, 1024x1792, 1792x1024", "1024x1024").option("--quality <q>", "Quality: auto, low, medium, high (gpt-image-1) or standard, hd (dall-e-3)", "auto").option("--model <model>", "Model: gpt-image-1 or dall-e-3", "gpt-image-1").option("--background <bg>", "Background: transparent, opaque, auto (gpt-image-1 only)").option("--format <fmt>", "Output: png, webp, jpeg (gpt-image-1 only)", "png").option("--raw", "Output raw JSON").option("--yes", "Skip the pre-spend confirmation (required in non-interactive shells)").action(async (prompt2, opts) => {
+  program2.command("image <prompt>").alias("img").description("Generate an image — costs 5 AMIKO").option("--size <size>", "Image size: 1024x1024, 1024x1792, 1792x1024", "1024x1024").option("--quality <q>", "Quality: auto, low, medium, high (gpt-image-1) or standard, hd (dall-e-3)", "auto").option("--model <model>", "Model: gpt-image-1 or dall-e-3", "gpt-image-1").option("--background <bg>", "Background: transparent, opaque, auto (gpt-image-1 only)").option("--format <fmt>", "Output: png, webp, jpeg (gpt-image-1 only)", "png").option("--wallet <address>", "Solana wallet address to pay from (required)").option("--raw", "Output raw JSON").option("--yes", "Skip the pre-spend confirmation (required in non-interactive shells)").action(async (prompt, opts) => {
     await requireApproval({
       cost: "5 AMIKO",
-      summary: `Generate image: ${prompt2.slice(0, 80)}${prompt2.length > 80 ? "…" : ""}`,
+      summary: `Generate image: ${prompt.slice(0, 80)}${prompt.length > 80 ? "…" : ""}`,
       yes: opts.yes,
-      commandExample: `amiko image ${JSON.stringify(prompt2)}`
+      commandExample: `amiko image ${JSON.stringify(prompt)}`
     });
     const isTTY = process.stderr.isTTY;
     const spinner = isTTY ? ora("Generating image...").start() : null;
@@ -20245,47 +19827,37 @@ function registerImageCommand(program2) {
     };
     try {
       const config2 = loadConfig();
-      const auth = resolveAuth(config2);
-      const mppBase2 = (config2.apiBase || "https://mpp.amikomarkets.com").replace(/\/$/, "");
-      const billingBase = auth.billingBase || "https://billing.heyamiko.com";
-      const billingToken = auth.platformKey || auth.twinToken || auth.privyToken;
-      if (!billingToken) {
+      let auth;
+      try {
+        auth = requireAuth();
+      } catch (e) {
         stopProgress();
-        console.error(error("Not authenticated. Check .amiko.json credentials."));
+        console.error(error(e instanceof Error ? e.message : "auth failed"));
         process.exit(1);
       }
-      const allWallets = auth.agentWallets || config2.agentWallets || [];
-      const solanaWallet = allWallets.find((w) => w.chain === "solana")?.address;
-      if (!solanaWallet) {
+      const mppBase2 = (config2.apiBase || "https://mpp.amikomarkets.com").replace(/\/$/, "");
+      const wallet = opts.wallet;
+      if (!wallet) {
         stopProgress();
-        console.error(error("No Solana wallet for AMIKO payment."));
+        console.error(error("Provide --wallet <address> to pay from."));
         process.exit(1);
       }
       setStatus("Paying 5 AMIKO...");
-      const transferRes = await fetch(`${billingBase}/api/crossmint/wallets/${encodeURIComponent(solanaWallet)}/transfer`, {
-        method: "POST",
-        headers: {
-          "Content-Type": "application/json",
-          Authorization: `Bearer ${billingToken}`
-        },
-        body: JSON.stringify({
-          to: TREASURY2,
-          amount: "5",
-          token: "AMIKO",
-          chain: "solana"
-        })
-      });
-      if (!transferRes.ok) {
-        stopProgress();
-        const err = await transferRes.json().catch(() => ({ error: "Transfer failed" }));
-        console.error(error(err.error || `Payment failed: ${transferRes.status}`));
-        process.exit(1);
-      }
-      const transferData = await transferRes.json();
-      const txHash = transferData.txHash;
-      if (!txHash) {
+      let txHash;
+      try {
+        const transferData = await amikoWebFetch(auth, `/api/agents/${encodeURIComponent(auth.twinId)}/wallets/${encodeURIComponent(wallet)}/transfer`, {
+          method: "POST",
+          body: { to: TREASURY2, amount: "5", token: "AMIKO", chain: "solana" }
+        });
+        if (!transferData.txHash) {
+          stopProgress();
+          console.error(error("Payment sent but no tx hash returned."));
+          process.exit(1);
+        }
+        txHash = transferData.txHash;
+      } catch (e) {
         stopProgress();
-        console.error(error("Payment sent but no tx hash returned."));
+        console.error(error(e instanceof Error ? e.message : "Payment failed"));
         process.exit(1);
       }
       startProgress("Generating image...");
@@ -20296,7 +19868,7 @@ function registerImageCommand(program2) {
           "X-Payment-Tx": txHash
         },
         body: JSON.stringify({
-          prompt: prompt2,
+          prompt,
           size: opts.size,
           quality: opts.quality,
           model: opts.model,
@@ -20317,7 +19889,7 @@ function registerImageCommand(program2) {
       }
       console.log(heading(`Image Generated
 `));
-      console.log(label("Prompt", prompt2));
+      console.log(label("Prompt", prompt));
       console.log(label("Model", opts.model));
       console.log(label("Size", opts.size));
       console.log("");
@@ -20329,7 +19901,7 @@ function registerImageCommand(program2) {
           console.log(label("Format", "base64 (inline image data)"));
           console.log(dim(`  ${img.b64_json.length.toLocaleString()} chars — save with: amiko image "..." --raw | jq -r '.images[0].b64_json' | base64 -d > image.png`));
         }
-        if (img.revised_prompt && img.revised_prompt !== prompt2) {
+        if (img.revised_prompt && img.revised_prompt !== prompt) {
           console.log(label("Revised", dim(img.revised_prompt)));
         }
       }
@@ -20346,27 +19918,18 @@ function registerImageCommand(program2) {
 
 // src/commands/amazon.ts
 var TREASURY3 = "FPiZAf3jEnNfCwfvbv46jdPfHbmSepD4Q6iHiLJDQXvb";
-async function payAmiko(billingBase, billingToken, solanaWallet, amount2) {
-  const res = await fetch(`${billingBase}/api/crossmint/wallets/${encodeURIComponent(solanaWallet)}/transfer`, {
+async function payAmiko(auth, wallet, amount2) {
+  const data = await amikoWebFetch(auth, `/api/agents/${encodeURIComponent(auth.twinId)}/wallets/${encodeURIComponent(wallet)}/transfer`, {
     method: "POST",
-    headers: {
-      "Content-Type": "application/json",
-      Authorization: `Bearer ${billingToken}`
-    },
-    body: JSON.stringify({ to: TREASURY3, amount: amount2, token: "AMIKO", chain: "solana" })
+    body: { to: TREASURY3, amount: amount2, token: "AMIKO", chain: "solana" }
   });
-  if (!res.ok) {
-    const err = await res.json().catch(() => ({ error: "Transfer failed" }));
-    throw new Error(err.error || `Payment failed: ${res.status}`);
-  }
-  const data = await res.json();
   if (!data.txHash)
     throw new Error("No tx hash returned.");
   return data.txHash;
 }
 function registerAmazonCommand(program2) {
   const cmd = program2.command("amazon").description("Search and buy products on Amazon — paid with AMIKO");
-  cmd.command("search <query>").description("Search Amazon products — 1 AMIKO").option("--limit <n>", "Number of results", "5").option("--raw", "Output raw JSON").option("--yes", "Skip the pre-spend confirmation (required in non-interactive shells)").action(async (query, opts) => {
+  cmd.command("search <query>").description("Search Amazon products — 1 AMIKO").option("--limit <n>", "Number of results", "5").option("--wallet <address>", "Solana wallet address to pay from (required)").option("--raw", "Output raw JSON").option("--yes", "Skip the pre-spend confirmation (required in non-interactive shells)").action(async (query, opts) => {
     await requireApproval({
       cost: "1 AMIKO",
       summary: `Amazon product search: ${query.slice(0, 80)}${query.length > 80 ? "…" : ""}`,
@@ -20376,24 +19939,23 @@ function registerAmazonCommand(program2) {
     const spinner = ora("Searching Amazon...").start();
     try {
       const config2 = loadConfig();
-      const auth = resolveAuth(config2);
-      const mppBase2 = (config2.apiBase || "https://mpp.amikomarkets.com").replace(/\/$/, "");
-      const billingBase = auth.billingBase || "https://billing.heyamiko.com";
-      const billingToken = auth.platformKey || auth.twinToken || auth.privyToken;
-      if (!billingToken) {
+      let auth;
+      try {
+        auth = requireAuth();
+      } catch (e) {
         spinner.stop();
-        console.error(error("Not authenticated. Check .amiko.json credentials."));
+        console.error(error(e instanceof Error ? e.message : "auth failed"));
         process.exit(1);
       }
-      const allWallets = auth.agentWallets || config2.agentWallets || [];
-      const solanaWallet = allWallets.find((w) => w.chain === "solana")?.address;
-      if (!solanaWallet) {
+      const mppBase2 = (config2.apiBase || "https://mpp.amikomarkets.com").replace(/\/$/, "");
+      const wallet = opts.wallet;
+      if (!wallet) {
         spinner.stop();
-        console.error(error("No Solana wallet."));
+        console.error(error("Provide --wallet <address>."));
         process.exit(1);
       }
       spinner.text = "Paying 1 AMIKO...";
-      const txHash = await payAmiko(billingBase, billingToken, solanaWallet, "1");
+      const txHash = await payAmiko(auth, wallet, "1");
       spinner.text = "Searching Amazon...";
       const params = new URLSearchParams({
         q: `site:amazon.com ${query}`
@@ -20444,7 +20006,6 @@ function registerAmazonCommand(program2) {
     const spinner = ora("Getting quote...").start();
     try {
       const config2 = loadConfig();
-      const auth = resolveAuth(config2);
       const mppBase2 = (config2.apiBase || "https://mpp.amikomarkets.com").replace(/\/$/, "");
       const res = await fetch(`${mppBase2}/v1/amazon/quote`, {
         method: "POST",
@@ -20513,7 +20074,7 @@ function usdToAmiko(usd2, pricePerAmiko) {
   const amount2 = usd2 / pricePerAmiko;
   return Math.ceil(amount2 * 100) / 100 + "";
 }
-async function payAndCall(mppBase2, method, path2, billingBase, billingToken, solanaWallet, amountOrAuto, body, onProgress, token = "AMIKO") {
+async function payAndCall(mppBase2, method, path2, auth, wallet, amountOrAuto, body, onProgress, token = "AMIKO") {
   let amount2 = amountOrAuto;
   if (amount2 === "auto") {
     onProgress?.("Fetching price...");
@@ -20538,25 +20099,11 @@ async function payAndCall(mppBase2, method, path2, billingBase, billingToken, so
       amount2 = "1";
     }
   }
-  onProgress?.(`Paying ${amount2} AMIKO...`);
-  const transferRes = await fetch(`${billingBase}/api/crossmint/wallets/${encodeURIComponent(solanaWallet)}/transfer`, {
+  onProgress?.(`Paying ${amount2} ${token}...`);
+  const transferData = await amikoWebFetch(auth, `/api/agents/${encodeURIComponent(auth.twinId)}/wallets/${encodeURIComponent(wallet)}/transfer`, {
     method: "POST",
-    headers: {
-      "Content-Type": "application/json",
-      Authorization: `Bearer ${billingToken}`
-    },
-    body: JSON.stringify({
-      to: TREASURY4,
-      amount: amount2,
-      token,
-      chain: "solana"
-    })
-  });
-  if (!transferRes.ok) {
-    const err = await transferRes.json().catch(() => ({ error: "Transfer failed" }));
-    throw new Error(err.error || `AMIKO payment failed: ${transferRes.status}`);
-  }
-  const transferData = await transferRes.json();
+    body: { to: TREASURY4, amount: amount2, token, chain: "solana" }
+  });
   const txHash = transferData.txHash;
   if (!txHash)
     throw new Error("Payment sent but no tx hash returned.");
@@ -20574,7 +20121,7 @@ async function payAndCall(mppBase2, method, path2, billingBase, billingToken, so
 }
 function registerServicesCommand(program2) {
   const svc = program2.command("service").alias("svc").description("Call any MPP service — pays with AMIKO tokens");
-  svc.command("tts <voiceId> <text>").description("Text-to-speech — 1 AMIKO").option("--raw", "Output raw response").option("--yes", "Skip the pre-spend confirmation (required in non-interactive shells)").action(async (voiceId, text, opts) => {
+  svc.command("tts <voiceId> <text>").description("Text-to-speech — 1 AMIKO").option("--raw", "Output raw response").option("--wallet <address>", "Solana wallet address to pay from (required)").option("--yes", "Skip the pre-spend confirmation (required in non-interactive shells)").action(async (voiceId, text, opts) => {
     await requireApproval({
       cost: "1 AMIKO",
       summary: `Text-to-speech (voice ${voiceId}): "${text.slice(0, 60)}${text.length > 60 ? "…" : ""}"`,
@@ -20590,7 +20137,7 @@ function registerServicesCommand(program2) {
       opts
     });
   });
-  svc.command("stt <audioUrl>").description("Speech-to-text — 1 AMIKO").option("--raw", "Output raw response").option("--yes", "Skip the pre-spend confirmation (required in non-interactive shells)").action(async (audioUrl, opts) => {
+  svc.command("stt <audioUrl>").description("Speech-to-text — 1 AMIKO").option("--raw", "Output raw response").option("--wallet <address>", "Solana wallet address to pay from (required)").option("--yes", "Skip the pre-spend confirmation (required in non-interactive shells)").action(async (audioUrl, opts) => {
     await requireApproval({
       cost: "1 AMIKO",
       summary: `Speech-to-text on ${audioUrl}`,
@@ -20624,7 +20171,7 @@ function registerServicesCommand(program2) {
       console.log(JSON.stringify(data, null, 2));
     }
   });
-  svc.command("chat <message>").description("AI chat — 1 AMIKO").option("--model <model>", "Model to use").option("--raw", "Output raw response").option("--yes", "Skip the pre-spend confirmation (required in non-interactive shells)").action(async (message, opts) => {
+  svc.command("chat <message>").description("AI chat — 1 AMIKO").option("--model <model>", "Model to use").option("--raw", "Output raw response").option("--wallet <address>", "Solana wallet address to pay from (required)").option("--yes", "Skip the pre-spend confirmation (required in non-interactive shells)").action(async (message, opts) => {
     await requireApproval({
       cost: "1 AMIKO",
       summary: `AI chat${opts.model ? ` (model ${opts.model})` : ""}: "${message.slice(0, 60)}${message.length > 60 ? "…" : ""}"`,
@@ -20643,7 +20190,7 @@ function registerServicesCommand(program2) {
       opts
     });
   });
-  svc.command("call <method> <path> [body]").description("Call any MPP endpoint — pays in AMIKO or USDC on Solana").option("--amiko <amount>", "AMIKO tokens to pay (default: auto-price from USD)").option("--usdc <amount>", "Pay in USDC instead of AMIKO").option("--raw", "Output raw response").option("--yes", "Skip the pre-spend confirmation (required in non-interactive shells)").action(async (method, path2, bodyStr, opts) => {
+  svc.command("call <method> <path> [body]").description("Call any MPP endpoint — pays in AMIKO or USDC on Solana").option("--amiko <amount>", "AMIKO tokens to pay (default: auto-price from USD)").option("--usdc <amount>", "Pay in USDC instead of AMIKO").option("--raw", "Output raw response").option("--wallet <address>", "Solana wallet address to pay from (required)").option("--yes", "Skip the pre-spend confirmation (required in non-interactive shells)").action(async (method, path2, bodyStr, opts) => {
     const costLabel = opts.usdc ? `${opts.usdc} USDC` : opts.amiko ? `${opts.amiko} AMIKO` : "auto-priced AMIKO (check /v1/ list for endpoint price first)";
     await requireApproval({
       cost: costLabel,
@@ -20699,27 +20246,26 @@ async function callService(params) {
   const spinner = ora(`${params.name}...`).start();
   try {
     const config2 = loadConfig();
-    const auth = resolveAuth(config2);
-    const mppBase2 = (config2.apiBase || "https://mpp.amikomarkets.com").replace(/\/$/, "");
-    const billingBase = auth.billingBase || "https://billing.heyamiko.com";
-    const billingToken = auth.platformKey || auth.twinToken || auth.privyToken;
-    if (!billingToken) {
+    let auth;
+    try {
+      auth = requireAuth();
+    } catch (e) {
       spinner.stop();
-      console.error(error("No auth token."));
+      console.error(error(e instanceof Error ? e.message : "auth failed"));
       process.exit(1);
     }
-    const allWallets = auth.agentWallets || config2.agentWallets || [];
-    const solanaWallet = allWallets.find((w) => w.chain === "solana")?.address;
-    if (!solanaWallet) {
+    const mppBase2 = (config2.apiBase || "https://mpp.amikomarkets.com").replace(/\/$/, "");
+    const wallet = params.opts.wallet;
+    if (!wallet) {
       spinner.stop();
-      console.error(error("No Solana wallet."));
+      console.error(error("Provide --wallet <address>."));
       process.exit(1);
     }
     const token = params.usdc ? "USDC" : "AMIKO";
     const amount2 = params.usdc || params.amiko || "auto";
-    const { res, txHash, amikoSpent } = await payAndCall(mppBase2, params.method, params.path, billingBase, billingToken, solanaWallet, token === "USDC" ? amount2 : amount2, params.body, (msg) => {
+    const { res, txHash, amikoSpent } = await payAndCall(mppBase2, params.method, params.path, auth, wallet, amount2, params.body, (msg) => {
       spinner.text = msg;
-    });
+    }, token);
     spinner.stop();
     if (!res.ok) {
       await reportHttpError(res, params.name);
@@ -20773,35 +20319,31 @@ function resolveTwinId(args) {
 function registerAccountsCommand(program2) {
   program2.command("accounts").description("Show resolved identity (platform, user, twin, wallets)").option("--json", "Output as JSON").action(async (opts) => {
     const config2 = loadConfig();
-    const auth = resolveAuth(config2);
+    const auth = resolveAuth();
     const data = {
-      mode: auth.mode,
+      authenticated: Boolean(auth.twinToken),
       platformUrl: auth.platformUrl ?? config2.platformUrl ?? config2.siteBase,
       userId: auth.userId ?? null,
-      activeTwinId: auth.twinId ?? config2.twinId ?? null,
-      wallets: auth.agentWallets ?? [],
-      hasTwinToken: Boolean(auth.twinToken),
-      hasPlatformKey: Boolean(auth.platformKey)
+      activeTwinId: auth.twinId ?? config2.twinId ?? null
     };
     renderOutput(data, (d) => {
       console.log(heading("Amiko Account"));
-      console.log(label("Mode", d.mode));
+      console.log(label("Authenticated", d.authenticated ? "yes" : "no"));
       if (d.platformUrl)
         console.log(label("Platform", d.platformUrl));
       if (d.userId)
         console.log(label("User ID", d.userId));
       if (d.activeTwinId)
         console.log(label("Active twin", d.activeTwinId));
-      console.log(label("Wallets", String(d.wallets.length)));
-      if (d.mode === "none") {
+      if (!d.authenticated) {
         console.log("");
-        console.log(error("No credentials found. Provision auth via .amiko.json or an API key."));
+        console.log(error("No credentials found. Place .amiko.json with amikoTwinToken."));
       }
     }, { json: opts.json });
   });
   program2.command("info").description("Get twin info (name, description, voice, avatar)").option("--twin <idOrName>", "Target twin id or name").option("--json", "Output as JSON").action(async (opts) => {
     const config2 = loadConfig();
-    const auth = resolveAuth(config2);
+    const auth = resolveAuth();
     let twinId;
     try {
       twinId = resolveTwinId({ flag: opts.twin, config: config2, auth });
@@ -20855,7 +20397,7 @@ function registerTwinCommand(program2) {
       process.exit(1);
     }
     const config2 = loadConfig();
-    const auth = resolveAuth(config2);
+    const auth = resolveAuth();
     let twinId;
     try {
       twinId = resolveTwinId({ flag: opts.twin, config: config2, auth });
@@ -21008,7 +20550,7 @@ function detectMime(buffer, name) {
 // src/commands/docs.ts
 function twinFromFlag(opts) {
   const config2 = loadConfig();
-  const auth = resolveAuth(config2);
+  const auth = resolveAuth();
   try {
     return { twinId: resolveTwinId({ flag: opts.twin, config: config2, auth }), auth };
   } catch (e) {
@@ -21154,7 +20696,7 @@ function registerDocsCommand(program2) {
 // src/commands/voice.ts
 function twinFromFlag2(opts) {
   const config2 = loadConfig();
-  const auth = resolveAuth(config2);
+  const auth = resolveAuth();
   try {
     return { twinId: resolveTwinId({ flag: opts.twin, config: config2, auth }), auth };
   } catch (e) {
@@ -21273,7 +20815,7 @@ function registerVoiceCommand(program2) {
 function registerAvatarCommand(program2) {
   program2.command("avatar:update").description("Update twin avatar image (path | https URL | - for stdin)").requiredOption("--file <source>", "Image source").option("--twin <idOrName>", "Target twin id or name").option("--stdin", "Read from stdin (file must be -)").option("--name <filename>", "Override filename").option("--yes", "Skip confirmation").option("--json", "Output as JSON").action(async (opts) => {
     const config2 = loadConfig();
-    const auth = resolveAuth(config2);
+    const auth = resolveAuth();
     let twinId;
     try {
       twinId = resolveTwinId({ flag: opts.twin, config: config2, auth });
@@ -21331,7 +20873,7 @@ function registerAvatarCommand(program2) {
 // src/commands/friends.ts
 function registerFriendsCommand(program2) {
   program2.command("friends").description("List friends").option("--type <user|twin>", "Filter by friend type").option("--json", "Output as JSON").action(async (opts) => {
-    const auth = resolveAuth(loadConfig());
+    const auth = resolveAuth();
     const spinner = opts.json ? null : ora("Loading friends...").start();
     try {
       const data = await amikoWebFetch(auth, "/api/friends", { query: { type: opts.type } });
@@ -21362,7 +20904,7 @@ function registerFriendsCommand(program2) {
     }
   });
   program2.command("friends:add").description("Send a friend request to a user by id").requiredOption("--id <userId>", "Target user id").option("--json", "Output as JSON").action(async (opts) => {
-    const auth = resolveAuth(loadConfig());
+    const auth = resolveAuth();
     const spinner = opts.json ? null : ora("Sending friend request...").start();
     try {
       const data = await amikoWebFetch(auth, "/api/friends", {
@@ -21382,7 +20924,7 @@ function registerFriendsCommand(program2) {
     }
   });
   program2.command("friends:accept <friendshipId>").description("Accept a pending friend request").option("--json", "Output as JSON").action(async (friendshipId, opts) => {
-    const auth = resolveAuth(loadConfig());
+    const auth = resolveAuth();
     const spinner = opts.json ? null : ora("Accepting...").start();
     try {
       const data = await amikoWebFetch(auth, `/api/friends/${friendshipId}`, { method: "PATCH", body: { action: "accept" } });
@@ -21400,7 +20942,7 @@ function registerFriendsCommand(program2) {
       yes: opts.yes,
       commandExample: `amiko friends:remove ${friendshipId}`
     });
-    const auth = resolveAuth(loadConfig());
+    const auth = resolveAuth();
     const spinner = opts.json ? null : ora("Removing...").start();
     try {
       const data = await amikoWebFetch(auth, `/api/friends/${friendshipId}`, { method: "DELETE" });
@@ -21417,7 +20959,7 @@ function registerFriendsCommand(program2) {
 // src/commands/feed.ts
 function registerFeedCommand(program2) {
   program2.command("feed").description("Get feed posts").option("--type <for_you|friends>", "Feed type", "friends").option("--hashtag <tag>", "Filter by hashtag").option("--limit <n>", "Max results (default 10, max 100)").option("--cursor <id>", "Pagination cursor").option("--json", "Output as JSON").action(async (opts) => {
-    const auth = resolveAuth(loadConfig());
+    const auth = resolveAuth();
     const spinner = opts.json ? null : ora("Loading feed...").start();
     try {
       const data = await amikoWebFetch(auth, "/api/feed", {
@@ -21458,7 +21000,7 @@ function registerFeedCommand(program2) {
     }
   });
   program2.command("post:create").description("Create a post on your feed").requiredOption("--content <text>", "Post body (required, non-empty)").option("--visibility <public|private>", "Post visibility", "public").option("--media <url...>", "One or more media URLs").option("--json", "Output as JSON").action(async (opts) => {
-    const auth = resolveAuth(loadConfig());
+    const auth = resolveAuth();
     const visibility = opts.visibility === "private" ? "private" : "public";
     const spinner = opts.json ? null : ora("Publishing post...").start();
     try {
@@ -21487,7 +21029,7 @@ function registerFeedCommand(program2) {
   });
   program2.command("post:comment").description("Comment on a post").requiredOption("--id <postId>", "Target post id").requiredOption("--comment <text>", "Comment body").option("--media <url...>", "One or more media URLs to attach").option("--twin <idOrName>", "Post as this twin (agent mode)").option("--json", "Output as JSON").action(async (opts) => {
     const config2 = loadConfig();
-    const auth = resolveAuth(config2);
+    const auth = resolveAuth();
     let twinId;
     if (opts.twin || auth.twinId) {
       try {
@@ -21525,7 +21067,7 @@ function registerFeedCommand(program2) {
 // src/commands/composio.ts
 function twinFromFlag3(opts) {
   const config2 = loadConfig();
-  const auth = resolveAuth(config2);
+  const auth = resolveAuth();
   try {
     return { twinId: resolveTwinId({ flag: opts.twin, config: config2, auth }), auth };
   } catch (e) {