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

package/dist/index.js

@@ -17287,7 +17287,6 @@ function resolveAuth() {
     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)
   };
 }
@@ -17305,7 +17304,6 @@ function requireAuth() {
 // 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"
 };
@@ -17313,7 +17311,6 @@ 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,
@@ -17385,7 +17382,6 @@ function registerConfigCommand(program2) {
     console.log("");
     console.log(heading("Endpoints"));
     console.log(label("  MPP service", config.apiBase));
-    console.log(label("  Billing API", config.billingBase));
     console.log(label("  Platform", config.platformUrl));
     console.log("");
     console.log(heading("Identity"));
@@ -18488,6 +18484,104 @@ async function requireApproval(args) {
   process.exit(2);
 }
 
+// src/lib/amiko-web.ts
+var DEFAULT_PLATFORM_URL = "https://platform.heyamiko.com";
+function baseUrl(auth) {
+  const url = auth.platformUrl || DEFAULT_PLATFORM_URL;
+  return url.replace(/\/$/, "");
+}
+function authHeader(auth) {
+  if (auth.twinToken)
+    return `Bearer ${auth.twinToken}`;
+  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}`);
+  if (opts.query) {
+    for (const [k, v] of Object.entries(opts.query)) {
+      if (v !== undefined && v !== null)
+        url.searchParams.set(k, String(v));
+    }
+  }
+  const headers = {
+    Authorization: authHeader(auth),
+    ...opts.headers
+  };
+  let body;
+  if (opts.multipart) {
+    body = opts.multipart;
+  } else if (opts.rawBody) {
+    body = opts.rawBody;
+    if (opts.rawContentType)
+      headers["Content-Type"] = opts.rawContentType;
+  } else if (opts.body) {
+    body = JSON.stringify(opts.body);
+    headers["Content-Type"] = "application/json";
+  }
+  const controller = new AbortController;
+  const timeoutMs = opts.timeoutMs ?? 30000;
+  const timer = setTimeout(() => controller.abort(), timeoutMs);
+  let res;
+  try {
+    res = await fetch(url, {
+      method: opts.method ?? "GET",
+      headers,
+      body,
+      signal: controller.signal
+    });
+  } finally {
+    clearTimeout(timer);
+  }
+  if (!res.ok) {
+    const text = await res.text().catch(() => "");
+    const err = new Error(formatError(res.status, text, path));
+    err.status = res.status;
+    err.body = text;
+    throw err;
+  }
+  const ctype = res.headers.get("content-type") || "";
+  if (ctype.includes("application/json")) {
+    return await res.json();
+  }
+  return await res.text();
+}
+function formatError(status, body, path) {
+  const prefix = `${status} ${path}`;
+  if (status === 401) {
+    return `${prefix}: unauthorized. The stored token is invalid or expired; re-link this device to Amiko.`;
+  }
+  if (status === 403) {
+    return `${prefix}: forbidden. The current auth context does not have access to this resource.`;
+  }
+  if (!body)
+    return prefix;
+  const snippet = body.length > 500 ? `${body.slice(0, 500)}...` : body;
+  return `${prefix}: ${snippet}`;
+}
+
+// src/lib/wallet-default.ts
+var cache = null;
+async function loadWallets(auth) {
+  if (cache)
+    return cache;
+  const data = await amikoWebFetch(auth, `/api/agents/${encodeURIComponent(auth.twinId)}/wallets`);
+  cache = data.wallets ?? [];
+  return cache;
+}
+async function resolveWalletAddress(auth, explicit, preferredChain = "solana") {
+  if (explicit)
+    return explicit;
+  const wallets = await loadWallets(auth);
+  const match = wallets.find((w) => w.status === "active" && w.chain === preferredChain);
+  if (match)
+    return match.wallet_address;
+  const anyActive = wallets.find((w) => w.status === "active");
+  if (anyActive && !explicit) {
+    throw new Error(`No active ${preferredChain} wallet found. Run \`amiko wallets create --chain ${preferredChain}\` or pass --wallet <address> explicitly.`);
+  }
+  throw new Error(`No wallets found for this agent. Run \`amiko wallets create --chain ${preferredChain}\` first.`);
+}
+
 // src/lib/across.ts
 function getBridgeBase() {
   const config = loadConfig();
@@ -18639,7 +18733,7 @@ var DEFAULT_ORIGIN = CHAINS.solana;
 var DEFAULT_DESTINATION = CHAINS.tempo;
 function registerBridgeCommand(program2) {
   const cmd = program2.command("bridge").description("Bridge USDC across chains via Across Protocol");
-  cmd.command("quote").description("Get a bridge quote for USDC transfer").argument("<amount>", "Amount of USDC to bridge (e.g., 10, 5.50)").option("--from <chain>", "Origin chain (default: solana)", "solana").option("--to <chain>", "Destination chain (default: tempo)", "tempo").option("--recipient <address>", "Recipient address on destination chain").option("--depositor <address>", "Depositor address on origin chain").action(async (amountStr, opts) => {
+  cmd.command("quote").description("Get a bridge quote for USDC transfer").argument("<amount>", "Amount of USDC to bridge (e.g., 10, 5.50)").option("--from <chain>", "Origin chain (default: solana)", "solana").option("--to <chain>", "Destination chain (default: tempo)", "tempo").option("--recipient <address>", "Recipient address on destination chain (required for Solana ↔ EVM)").option("--depositor <address>", "Depositor address on origin chain (defaults to your wallet on that chain)").action(async (amountStr, opts) => {
     const spinner = ora("Fetching bridge quote...").start();
     try {
       const originChainId = resolveChainId(opts.from);
@@ -18647,10 +18741,14 @@ function registerBridgeCommand(program2) {
       const inputToken = getUsdcAddress(originChainId);
       const outputToken = getUsdcAddress(destChainId);
       const amount = parseUsdcAmount(amountStr);
-      const depositor = opts.depositor;
-      if (!depositor) {
+      const preferredChain = originChainId === CHAINS.solana ? "solana" : "base";
+      let depositor;
+      try {
+        const auth = requireAuth();
+        depositor = await resolveWalletAddress(auth, opts.depositor, preferredChain);
+      } catch (e) {
         spinner.stop();
-        console.error(error("No depositor address. Provide --depositor <address>."));
+        console.error(error(e instanceof Error ? e.message : String(e)));
         process.exit(1);
       }
       const isCrossEcosystem = originChainId === CHAINS.solana !== (destChainId === CHAINS.solana);
@@ -18698,8 +18796,8 @@ function registerBridgeCommand(program2) {
       }
       if (quote.swapTx) {
         console.log("");
-        console.log(dim('Transaction ready. Run "amiko bridge send" to execute.'));
-        console.log(dim(`  amiko bridge send ${amountStr} --from ${opts.from} --to ${opts.to}`));
+        console.log(dim('Transaction ready. Run "amiko wallets bridge send" to execute.'));
+        console.log(dim(`  amiko wallets bridge send ${amountStr} --from ${opts.from} --to ${opts.to}${opts.depositor ? ` --depositor ${opts.depositor}` : ""}${opts.recipient ? ` --recipient ${opts.recipient}` : ""}`));
       }
     } catch (err) {
       spinner.stop();
@@ -18707,7 +18805,7 @@ function registerBridgeCommand(program2) {
       process.exit(1);
     }
   });
-  cmd.command("send").description("Execute a USDC bridge transfer via Across").argument("<amount>", "Amount of USDC to bridge (e.g., 10, 5.50)").option("--from <chain>", "Origin chain (default: solana)", "solana").option("--to <chain>", "Destination chain (default: tempo)", "tempo").option("--recipient <address>", "Recipient address on destination chain").option("--depositor <address>", "Depositor address on origin chain").option("--raw", "Output raw transaction JSON for manual signing").option("--yes", "Skip confirmation (only after the user has approved)").action(async (amountStr, opts) => {
+  cmd.command("send").description("Execute a USDC bridge transfer via Across").argument("<amount>", "Amount of USDC to bridge (e.g., 10, 5.50)").option("--from <chain>", "Origin chain (default: solana)", "solana").option("--to <chain>", "Destination chain (default: tempo)", "tempo").option("--recipient <address>", "Recipient address on destination chain (required for Solana ↔ EVM)").option("--depositor <address>", "Depositor address on origin chain (defaults to your wallet on that chain)").option("--raw", "Output raw transaction JSON for manual signing").option("--yes", "Skip confirmation (only after the user has approved)").action(async (amountStr, opts) => {
     const spinner = ora("Preparing bridge transaction...").start();
     try {
       const originChainId = resolveChainId(opts.from);
@@ -18715,10 +18813,14 @@ function registerBridgeCommand(program2) {
       const inputToken = getUsdcAddress(originChainId);
       const outputToken = getUsdcAddress(destChainId);
       const amount = parseUsdcAmount(amountStr);
-      const depositor = opts.depositor;
-      if (!depositor) {
+      const preferredChain = originChainId === CHAINS.solana ? "solana" : "base";
+      let depositor;
+      try {
+        const auth = requireAuth();
+        depositor = await resolveWalletAddress(auth, opts.depositor, preferredChain);
+      } catch (e) {
         spinner.stop();
-        console.error(error("No depositor address. Provide --depositor <address>."));
+        console.error(error(e instanceof Error ? e.message : String(e)));
         process.exit(1);
       }
       const isCrossEcosystem = originChainId === CHAINS.solana !== (destChainId === CHAINS.solana);
@@ -18752,7 +18854,7 @@ function registerBridgeCommand(program2) {
           cost: quote.fees?.total ? `${formatUsdcAmount(quote.fees.total.amount)} USDC bridge fee + gas` : "gas + Across fee",
           summary: `bridge ${formatUsdcAmount(quote.inputAmount)} USDC ${originName} → ${destName}`,
           yes: opts.yes,
-          commandExample: `amiko bridge send ${amountStr} --from ${opts.from} --to ${opts.to}`
+          commandExample: `amiko wallets bridge send ${amountStr} --from ${opts.from} --to ${opts.to}`
         });
       }
       if (opts.raw) {
@@ -18831,7 +18933,7 @@ function registerBridgeCommand(program2) {
         console.log(dim(output.trim()));
         console.log("");
         console.log(dim("Track status:"));
-        console.log(dim(`  amiko bridge status <txHash> --chain ${originChainId}`));
+        console.log(dim(`  amiko wallets bridge status <txHash> --chain ${originChainId}`));
       } catch (err) {
         bridgeSpinner.fail("Bridge transaction failed");
         console.error(error(err instanceof Error ? err.message : "Transaction failed"));
@@ -18978,94 +19080,13 @@ function registerBridgeCommand(program2) {
 // src/commands/credits.ts
 import readline2 from "node:readline";
 
-// src/lib/amiko-web.ts
-var DEFAULT_PLATFORM_URL = "https://platform.heyamiko.com";
-function baseUrl(auth) {
-  const url = auth.platformUrl || DEFAULT_PLATFORM_URL;
-  return url.replace(/\/$/, "");
-}
-function authHeader(auth) {
-  if (auth.twinToken)
-    return `Bearer ${auth.twinToken}`;
-  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}`);
-  if (opts.query) {
-    for (const [k, v] of Object.entries(opts.query)) {
-      if (v !== undefined && v !== null)
-        url.searchParams.set(k, String(v));
-    }
-  }
-  const headers = {
-    Authorization: authHeader(auth),
-    ...opts.headers
-  };
-  let body;
-  if (opts.multipart) {
-    body = opts.multipart;
-  } else if (opts.rawBody) {
-    body = opts.rawBody;
-    if (opts.rawContentType)
-      headers["Content-Type"] = opts.rawContentType;
-  } else if (opts.body) {
-    body = JSON.stringify(opts.body);
-    headers["Content-Type"] = "application/json";
-  }
-  const controller = new AbortController;
-  const timeoutMs = opts.timeoutMs ?? 30000;
-  const timer = setTimeout(() => controller.abort(), timeoutMs);
-  let res;
-  try {
-    res = await fetch(url, {
-      method: opts.method ?? "GET",
-      headers,
-      body,
-      signal: controller.signal
-    });
-  } finally {
-    clearTimeout(timer);
-  }
-  if (!res.ok) {
-    const text = await res.text().catch(() => "");
-    const err = new Error(formatError(res.status, text, path));
-    err.status = res.status;
-    err.body = text;
-    throw err;
-  }
-  const ctype = res.headers.get("content-type") || "";
-  if (ctype.includes("application/json")) {
-    return await res.json();
-  }
-  return await res.text();
-}
-function formatError(status, body, path) {
-  const prefix = `${status} ${path}`;
-  if (status === 401) {
-    return `${prefix}: unauthorized. The stored token is invalid or expired; re-link this device to Amiko.`;
-  }
-  if (status === 403) {
-    return `${prefix}: forbidden. The current auth context does not have access to this resource.`;
-  }
-  if (!body)
-    return prefix;
-  const snippet = body.length > 500 ? `${body.slice(0, 500)}...` : body;
-  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);
+    const data = await amikoWebFetch(auth, `/api/proxy/service/api/credits`);
+    const raw = data.displayBalance;
     return typeof raw === "number" && isFinite(raw) ? Math.round(raw) : null;
   } catch {
     return null;
@@ -19077,8 +19098,7 @@ async function printBalanceRemaining(auth) {
     console.log(dim("Balance: (could not fetch)"));
     return;
   }
-  const usd2 = (balance / 1e4).toFixed(2);
-  console.log(label("Balance", `${balance.toLocaleString()} credits (~$${usd2})`));
+  console.log(label("Balance", `${balance.toLocaleString()} credits`));
 }
 
 // src/lib/mpp-topup.ts
@@ -19170,8 +19190,7 @@ function registerCreditsCommand(program2) {
       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})`));
+    console.log(label("Balance", source_default.bold(`${balance.toLocaleString()} credits`)));
   });
   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 !== "");
@@ -19307,6 +19326,7 @@ function registerCreditsCommand(program2) {
       if (mppResult.credits?.balance)
         console.log(label("Balance", String(mppResult.credits.balance)));
       console.log(success("Credits topped up via MPP."));
+      console.log(dim("Balance may take a moment to reflect on-chain confirmation — re-run `amiko credits balance` if it looks stale."));
       return;
     }
     console.log(heading("Top-up Summary"));
@@ -19351,6 +19371,7 @@ function registerCreditsCommand(program2) {
       }
       console.log("");
       console.log(success("Credits topped up."));
+      console.log(dim("Balance may take a moment to reflect on-chain confirmation — re-run `amiko credits balance` if it looks stale."));
     } catch (e) {
       spinner.stop();
       console.error(error(e instanceof Error ? e.message : "Top-up failed"));
@@ -19465,14 +19486,15 @@ function registerSwapCommand(program2) {
         console.log(label("Route", dim(route)));
       }
       console.log("");
-      console.log(dim(`To execute: amiko swap send ${amountStr} ${fromToken} ${toToken}`));
+      console.log(dim(`To execute: amiko wallets swap send ${amountStr} ${fromToken} ${toToken}` + `
+(uses your default Solana wallet; pass --wallet <address> to override)`));
     } catch (err) {
       spinner.stop();
       console.error(error(err instanceof Error ? err.message : "Failed to get quote"));
       process.exit(1);
     }
   });
-  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) => {
+  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>", "Solana wallet to swap from (defaults to your Solana wallet — run `amiko wallets create --chain solana` if none)").option("--slippage <bps>", "Slippage tolerance in basis points", "50").option("--yes", "Skip confirmation").action(async (amountStr, fromToken, toToken, opts) => {
     try {
       let auth;
       try {
@@ -19481,9 +19503,11 @@ function registerSwapCommand(program2) {
         console.error(error(e instanceof Error ? e.message : "auth failed"));
         process.exit(1);
       }
-      const wallet = opts.wallet;
-      if (!wallet) {
-        console.error(error("No Solana wallet specified. Provide --wallet <address>."));
+      let wallet;
+      try {
+        wallet = await resolveWalletAddress(auth, opts.wallet, "solana");
+      } catch (e) {
+        console.error(error(e instanceof Error ? e.message : String(e)));
         process.exit(1);
       }
       const input = resolveToken(fromToken);
@@ -19514,7 +19538,7 @@ function registerSwapCommand(program2) {
         cost: "Solana gas + 10bps platform fee",
         summary: `swap ${amountStr} ${fromToken.toUpperCase()} → ~${(Number(quote.outAmount) / 10 ** output.decimals).toFixed(6)} ${output.symbol}`,
         yes: opts.yes,
-        commandExample: `amiko swap send ${amountStr} ${fromToken} ${toToken}`
+        commandExample: `amiko wallets swap send ${amountStr} ${fromToken} ${toToken}`
       });
       const swapSpinner = ora("Executing swap via platform...").start();
       let swapData;
@@ -19561,7 +19585,7 @@ function registerSwapCommand(program2) {
         console.log(`  ${source_default.cyan(t.symbol.padEnd(10))} ${t.name.padEnd(25)} ${dim(truncAddr(t.address))}`);
       }
       console.log("");
-      console.log(dim("Use symbol or mint address: amiko swap quote 5 usdt usdc"));
+      console.log(dim("Use symbol or mint address: amiko wallets swap quote 5 usdt usdc"));
     } catch (err) {
       spinner.stop();
       console.error(error(err instanceof Error ? err.message : "Failed to fetch tokens"));
@@ -19582,6 +19606,71 @@ function detectPackageManager() {
     return "npm";
   }
 }
+function isPrerelease(v) {
+  return v.includes("-");
+}
+function compareSemver(a, b) {
+  const [aMain, aPre] = a.split("-", 2);
+  const [bMain, bPre] = b.split("-", 2);
+  const an = aMain.split(".").map(Number);
+  const bn = bMain.split(".").map(Number);
+  for (let i = 0;i < 3; i++) {
+    if ((an[i] ?? 0) !== (bn[i] ?? 0))
+      return (an[i] ?? 0) > (bn[i] ?? 0) ? 1 : -1;
+  }
+  if (!aPre && !bPre)
+    return 0;
+  if (!aPre)
+    return 1;
+  if (!bPre)
+    return -1;
+  const ap = aPre.split(".");
+  const bp = bPre.split(".");
+  for (let i = 0;i < Math.max(ap.length, bp.length); i++) {
+    const x = ap[i];
+    const y = bp[i];
+    if (x === undefined)
+      return -1;
+    if (y === undefined)
+      return 1;
+    const xn = /^\d+$/.test(x) ? Number(x) : NaN;
+    const yn = /^\d+$/.test(y) ? Number(y) : NaN;
+    if (!isNaN(xn) && !isNaN(yn)) {
+      if (xn !== yn)
+        return xn > yn ? 1 : -1;
+    } else if (!isNaN(xn)) {
+      return -1;
+    } else if (!isNaN(yn)) {
+      return 1;
+    } else if (x !== y) {
+      return x > y ? 1 : -1;
+    }
+  }
+  return 0;
+}
+async function fetchDistTags(pkg) {
+  const url2 = `https://registry.npmjs.org/-/package/${encodeURIComponent(pkg)}/dist-tags`;
+  const res = await fetch(url2);
+  if (!res.ok)
+    throw new Error(`registry responded ${res.status}`);
+  return await res.json();
+}
+async function resolveTargetVersion(pkg, currentVersion) {
+  if (!isPrerelease(currentVersion)) {
+    return { version: "latest", channel: "latest" };
+  }
+  const tags = await fetchDistTags(pkg);
+  const latest = tags.latest;
+  const beta = tags.beta;
+  if (latest && beta) {
+    return compareSemver(latest, beta) >= 0 ? { version: latest, channel: "latest" } : { version: beta, channel: "beta" };
+  }
+  if (beta)
+    return { version: beta, channel: "beta" };
+  if (latest)
+    return { version: latest, channel: "latest" };
+  return { version: "latest", channel: "latest" };
+}
 var DATA_CLI = "/data/.amiko-cli";
 var NPM_GLOBAL_CANDIDATES = [
   "/usr/local/lib/node_modules/@heyamiko/amiko-cli",
@@ -19627,17 +19716,21 @@ function registerUpdateCommand(program2) {
     console.log(heading("Update"));
     console.log(label("Current", `v${currentVersion}`));
     console.log(label("Package manager", pm));
+    let target;
+    try {
+      target = await resolveTargetVersion(pkg, currentVersion);
+    } catch {
+      target = { version: "latest", channel: "latest" };
+    }
+    const installSpec = `${pkg}@${target.version}`;
+    console.log(label("Target", target.version === "latest" ? "latest" : `${target.version} (${target.channel})`));
     console.log("");
-    const spinner = ora("Installing latest version...").start();
+    const spinner = ora(`Installing ${installSpec}...`).start();
     try {
       if (pm === "bun") {
-        execFileSync2("bun", ["install", "-g", `${pkg}@latest`], {
-          stdio: "pipe"
-        });
+        execFileSync2("bun", ["install", "-g", installSpec], { stdio: "pipe" });
       } else {
-        execFileSync2("npm", ["install", "-g", `${pkg}@latest`], {
-          stdio: "pipe"
-        });
+        execFileSync2("npm", ["install", "-g", installSpec], { stdio: "pipe" });
       }
       spinner.stop();
       let syncedTwin = false;
@@ -19667,7 +19760,7 @@ function registerUpdateCommand(program2) {
       console.error(error("Auto-update failed."));
       console.log("");
       console.log(dim("Try manually:"));
-      console.log(dim(`  ${pm} install -g ${pkg}@latest`));
+      console.log(dim(`  ${pm} install -g ${installSpec}`));
       process.exit(1);
     }
   });
@@ -19691,12 +19784,12 @@ 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("--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) => {
+  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>", "Wallet to pay from (defaults to your Solana wallet — run `amiko wallets create --chain solana` if you don't have one)").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 ? "…" : ""}`,
       yes: opts.yes,
-      commandExample: `amiko search ${JSON.stringify(query)}${opts.token && opts.token !== "AMIKO" ? ` --token ${opts.token}` : ""}`
+      commandExample: `amiko markets search ${JSON.stringify(query)}${opts.token && opts.token !== "AMIKO" ? ` --token ${opts.token}` : ""}`
     });
     const spinner = ora("X Search...").start();
     try {
@@ -19713,10 +19806,12 @@ function registerSearchCommand(program2) {
       const token = opts.token || "AMIKO";
       const chain = "solana";
       const amount2 = token === "AMIKO" ? "1" : "0.01";
-      const wallet = opts.wallet;
-      if (!wallet) {
+      let wallet;
+      try {
+        wallet = await resolveWalletAddress(auth, opts.wallet, "solana");
+      } catch (e) {
         spinner.stop();
-        console.error(error("Provide --wallet <address> to pay from."));
+        console.error(error(e instanceof Error ? e.message : String(e)));
         process.exit(1);
       }
       spinner.text = `Paying ${amount2} ${token} (${chain})...`;
@@ -19790,12 +19885,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("--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) => {
+  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>", "Wallet to pay from (defaults to your Solana wallet — run `amiko wallets create --chain solana` if you don't have one)").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: ${prompt.slice(0, 80)}${prompt.length > 80 ? "…" : ""}`,
       yes: opts.yes,
-      commandExample: `amiko image ${JSON.stringify(prompt)}`
+      commandExample: `amiko markets image ${JSON.stringify(prompt)}`
     });
     const isTTY = process.stderr.isTTY;
     const spinner = isTTY ? ora("Generating image...").start() : null;
@@ -19836,10 +19931,12 @@ function registerImageCommand(program2) {
         process.exit(1);
       }
       const mppBase2 = (config2.apiBase || "https://mpp.amikomarkets.com").replace(/\/$/, "");
-      const wallet = opts.wallet;
-      if (!wallet) {
+      let wallet;
+      try {
+        wallet = await resolveWalletAddress(auth, opts.wallet, "solana");
+      } catch (e) {
         stopProgress();
-        console.error(error("Provide --wallet <address> to pay from."));
+        console.error(error(e instanceof Error ? e.message : String(e)));
         process.exit(1);
       }
       setStatus("Paying 5 AMIKO...");
@@ -19899,7 +19996,7 @@ function registerImageCommand(program2) {
           console.log(label("URL", img.url));
         } else if (img.b64_json) {
           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`));
+          console.log(dim(`  ${img.b64_json.length.toLocaleString()} chars — save with: amiko markets image "..." --raw | jq -r '.images[0].b64_json' | base64 -d > image.png`));
         }
         if (img.revised_prompt && img.revised_prompt !== prompt) {
           console.log(label("Revised", dim(img.revised_prompt)));
@@ -19929,12 +20026,12 @@ async function payAmiko(auth, wallet, amount2) {
 }
 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("--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) => {
+  cmd.command("search <query>").description("Search Amazon products — 1 AMIKO").option("--limit <n>", "Number of results", "5").option("--wallet <address>", "Wallet to pay from (defaults to your Solana wallet — run `amiko wallets create --chain solana` if you don't have one)").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 ? "…" : ""}`,
       yes: opts.yes,
-      commandExample: `amiko amazon search ${JSON.stringify(query)}`
+      commandExample: `amiko markets amazon search ${JSON.stringify(query)}`
     });
     const spinner = ora("Searching Amazon...").start();
     try {
@@ -19948,10 +20045,12 @@ function registerAmazonCommand(program2) {
         process.exit(1);
       }
       const mppBase2 = (config2.apiBase || "https://mpp.amikomarkets.com").replace(/\/$/, "");
-      const wallet = opts.wallet;
-      if (!wallet) {
+      let wallet;
+      try {
+        wallet = await resolveWalletAddress(auth, opts.wallet, "solana");
+      } catch (e) {
         spinner.stop();
-        console.error(error("Provide --wallet <address>."));
+        console.error(error(e instanceof Error ? e.message : String(e)));
         process.exit(1);
       }
       spinner.text = "Paying 1 AMIKO...";
@@ -20121,12 +20220,12 @@ async function payAndCall(mppBase2, method, path2, auth, wallet, amountOrAuto, b
 }
 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("--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) => {
+  svc.command("tts <voiceId> <text>").description("Text-to-speech — 1 AMIKO").option("--raw", "Output raw response").option("--wallet <address>", "Wallet to pay from (defaults to your Solana wallet — run `amiko wallets create --chain solana` if none)").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 ? "…" : ""}"`,
       yes: opts.yes,
-      commandExample: `amiko service tts ${voiceId} ${JSON.stringify(text)}`
+      commandExample: `amiko markets service tts ${voiceId} ${JSON.stringify(text)}`
     });
     await callService({
       name: "Text-to-Speech",
@@ -20137,12 +20236,12 @@ function registerServicesCommand(program2) {
       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) => {
+  svc.command("stt <audioUrl>").description("Speech-to-text — 1 AMIKO").option("--raw", "Output raw response").option("--wallet <address>", "Wallet to pay from (defaults to your Solana wallet — run `amiko wallets create --chain solana` if none)").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}`,
       yes: opts.yes,
-      commandExample: `amiko service stt ${JSON.stringify(audioUrl)}`
+      commandExample: `amiko markets service stt ${JSON.stringify(audioUrl)}`
     });
     await callService({
       name: "Speech-to-Text",
@@ -20171,12 +20270,12 @@ 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("--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) => {
+  svc.command("chat <message>").description("AI chat — 1 AMIKO").option("--model <model>", "Model to use").option("--raw", "Output raw response").option("--wallet <address>", "Wallet to pay from (defaults to your Solana wallet — run `amiko wallets create --chain solana` if none)").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 ? "…" : ""}"`,
       yes: opts.yes,
-      commandExample: `amiko service chat ${JSON.stringify(message)}${opts.model ? ` --model ${opts.model}` : ""}`
+      commandExample: `amiko markets service chat ${JSON.stringify(message)}${opts.model ? ` --model ${opts.model}` : ""}`
     });
     const body = { message };
     if (opts.model)
@@ -20190,13 +20289,13 @@ 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("--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) => {
+  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>", "Wallet to pay from (defaults to your Solana wallet — run `amiko wallets create --chain solana` if none)").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,
       summary: `${method.toUpperCase()} ${path2}`,
       yes: opts.yes,
-      commandExample: `amiko service call ${method.toUpperCase()} ${path2}${bodyStr ? ` ${JSON.stringify(bodyStr)}` : ""}${opts.amiko ? ` --amiko ${opts.amiko}` : ""}${opts.usdc ? ` --usdc ${opts.usdc}` : ""}`
+      commandExample: `amiko markets service call ${method.toUpperCase()} ${path2}${bodyStr ? ` ${JSON.stringify(bodyStr)}` : ""}${opts.amiko ? ` --amiko ${opts.amiko}` : ""}${opts.usdc ? ` --usdc ${opts.usdc}` : ""}`
     });
     let body;
     if (bodyStr) {
@@ -20255,10 +20354,12 @@ async function callService(params) {
       process.exit(1);
     }
     const mppBase2 = (config2.apiBase || "https://mpp.amikomarkets.com").replace(/\/$/, "");
-    const wallet = params.opts.wallet;
-    if (!wallet) {
+    let wallet;
+    try {
+      wallet = await resolveWalletAddress(auth, params.opts.wallet, "solana");
+    } catch (e) {
       spinner.stop();
-      console.error(error("Provide --wallet <address>."));
+      console.error(error(e instanceof Error ? e.message : String(e)));
       process.exit(1);
     }
     const token = params.usdc ? "USDC" : "AMIKO";
@@ -20391,7 +20492,7 @@ function parseBool(raw, flag) {
   throw new Error(`${flag} must be true or false, got "${raw}"`);
 }
 function registerTwinCommand(program2) {
-  program2.command("twin:update").description("Update twin name, description, or public visibility").option("--name <name>", "Display name").option("--description <text>", "Description").option("--public <bool>", "Public visibility (true/false)").option("--twin <idOrName>", "Target twin id or name").option("--yes", "Skip confirmation when changing visibility").option("--json", "Output as JSON").action(async (opts) => {
+  program2.command("update").description("Update twin name, description, or public visibility").option("--name <name>", "Display name").option("--description <text>", "Description").option("--public <bool>", "Public visibility (true/false)").option("--twin <idOrName>", "Target twin id or name").option("--yes", "Skip confirmation when changing visibility").option("--json", "Output as JSON").action(async (opts) => {
     if (opts.name === undefined && opts.description === undefined && opts.public === undefined) {
       console.error(error("Pass at least one of --name, --description, --public"));
       process.exit(1);
@@ -20426,7 +20527,7 @@ function registerTwinCommand(program2) {
         action: `Set twin visibility to ${next ? "PUBLIC" : "PRIVATE"}`,
         detail: next ? "Anyone on amiko.com will be able to find and chat with this twin." : "The twin will no longer be discoverable.",
         yes: opts.yes,
-        commandExample: `amiko twin:update --public ${next}`
+        commandExample: `amiko twin update --public ${next}`
       });
     }
     const spinner = opts.json ? null : ora("Updating twin...").start();
@@ -20548,6 +20649,18 @@ function detectMime(buffer, name) {
 }
 
 // src/commands/docs.ts
+function fmtBytes(n) {
+  if (!n || n <= 0)
+    return "-";
+  const units = ["B", "KB", "MB", "GB"];
+  let v = n;
+  let i = 0;
+  while (v >= 1024 && i < units.length - 1) {
+    v /= 1024;
+    i++;
+  }
+  return `${v.toFixed(v >= 10 ? 0 : 1)} ${units[i]}`;
+}
 function twinFromFlag(opts) {
   const config2 = loadConfig();
   const auth = resolveAuth();
@@ -20561,20 +20674,8 @@ function twinFromFlag(opts) {
     throw e;
   }
 }
-function fmtBytes(n) {
-  if (!n || n <= 0)
-    return "-";
-  const units = ["B", "KB", "MB", "GB"];
-  let v = n;
-  let i = 0;
-  while (v >= 1024 && i < units.length - 1) {
-    v /= 1024;
-    i++;
-  }
-  return `${v.toFixed(v >= 10 ? 0 : 1)} ${units[i]}`;
-}
 function registerDocsCommand(program2) {
-  program2.command("docs").description("List uploaded documents for a twin").option("--twin <idOrName>", "Target twin id or name").option("--limit <n>", "Max results", "50").option("--json", "Output as JSON").action(async (opts) => {
+  program2.command("list").description("List uploaded documents for a twin").option("--twin <idOrName>", "Target twin id or name").option("--limit <n>", "Max results", "50").option("--json", "Output as JSON").action(async (opts) => {
     const { twinId, auth } = twinFromFlag(opts);
     const spinner = opts.json ? null : ora("Loading documents...").start();
     try {
@@ -20590,15 +20691,15 @@ function registerDocsCommand(program2) {
           [
             dim("ID"),
             dim("NAME"),
-            dim("SIZE"),
+            dim("TYPE"),
             dim("STATUS"),
             dim("CREATED")
           ],
           ...d.docs.map((doc2) => [
             doc2.id.slice(0, 8),
             doc2.title || doc2.filename,
-            fmtBytes(doc2.file_size),
-            doc2.status || "-",
+            doc2.file_type || "-",
+            doc2.is_processed ? "processed" : doc2.is_parsed ? "parsed" : "pending",
             doc2.created_at?.slice(0, 10) || "-"
           ])
         ];
@@ -20610,7 +20711,7 @@ function registerDocsCommand(program2) {
       process.exit(1);
     }
   });
-  program2.command("docs:upload <source>").description("Upload a document (path | https URL | - for stdin)").option("--twin <idOrName>", "Target twin id or name").option("--name <filename>", "Override filename").option("--title <title>", "Document title (defaults to filename)").option("--description <text>", "Document description").option("--doc-type <type>", "Document type (e.g. 'other', 'memory')", "other").option("--stdin", "Read from stdin (source must be -)").option("--json", "Output as JSON").action(async (source, opts) => {
+  program2.command("upload <source>").description("Upload a document (path | https URL | - for stdin)").option("--twin <idOrName>", "Target twin id or name").option("--name <filename>", "Override filename").option("--title <title>", "Document title (defaults to filename)").option("--description <text>", "Document description").option("--doc-type <type>", "Document type (e.g. 'other', 'memory')", "other").option("--stdin", "Read from stdin (source must be -)").option("--json", "Output as JSON").action(async (source, opts) => {
     const { twinId, auth } = twinFromFlag(opts);
     const spinner = opts.json ? null : ora("Reading input...").start();
     try {
@@ -20661,13 +20762,13 @@ function registerDocsCommand(program2) {
       process.exit(1);
     }
   });
-  program2.command("docs:delete <docId>").description("Delete a document").option("--twin <idOrName>", "Target twin id or name").option("--yes", "Skip confirmation").option("--json", "Output as JSON").action(async (docId, opts) => {
+  program2.command("delete <docId>").description("Delete a document").option("--twin <idOrName>", "Target twin id or name").option("--yes", "Skip confirmation").option("--json", "Output as JSON").action(async (docId, opts) => {
     const { twinId, auth } = twinFromFlag(opts);
     await confirmDestructive({
       action: `Delete document ${docId}`,
       detail: "This will remove the document and its embeddings from the twin's RAG.",
       yes: opts.yes,
-      commandExample: `amiko docs:delete ${docId}`
+      commandExample: `amiko docs delete ${docId}`
     });
     const spinner = opts.json ? null : ora("Deleting document...").start();
     try {
@@ -20680,7 +20781,7 @@ function registerDocsCommand(program2) {
       process.exit(1);
     }
   });
-  program2.command("docs:presign <source>").description("Get a presigned upload URL for a document (no upload)").option("--twin <idOrName>", "Target twin id or name").option("--name <filename>", "Override filename used in the request").option("--json", "Output as JSON").action(async (source, opts) => {
+  program2.command("presign <source>").description("Get a presigned upload URL for a document (no upload)").option("--twin <idOrName>", "Target twin id or name").option("--name <filename>", "Override filename used in the request").option("--json", "Output as JSON").action(async (source, opts) => {
     const { twinId, auth } = twinFromFlag(opts);
     const filename = opts.name ?? (source === "-" ? "stdin" : source.split("/").pop() ?? source);
     try {
@@ -20708,7 +20809,7 @@ function twinFromFlag2(opts) {
   }
 }
 function registerVoiceCommand(program2) {
-  program2.command("voice:design").description("Design a voice from a text description").requiredOption("--description <text>", "Voice description (min 20 chars)").option("--twin <idOrName>", "Target twin id or name").option("--json", "Output as JSON").action(async (opts) => {
+  program2.command("design").description("Design a voice from a text description").requiredOption("--description <text>", "Voice description (min 20 chars)").option("--twin <idOrName>", "Target twin id or name").option("--json", "Output as JSON").action(async (opts) => {
     if (opts.description.trim().length < 20) {
       console.error(error("--description must be at least 20 characters"));
       process.exit(1);
@@ -20728,7 +20829,7 @@ function registerVoiceCommand(program2) {
           console.log(label(`#${i + 1} id`, p.generated_voice_id ?? "?"));
         }
         console.log("");
-        console.log(dim("Pick one with: amiko voice:create --sample <id>"));
+        console.log(dim("Pick one with: amiko voice create --sample <id>"));
       }, { json: opts.json });
     } catch (e) {
       spinner?.stop();
@@ -20736,7 +20837,7 @@ function registerVoiceCommand(program2) {
       process.exit(1);
     }
   });
-  program2.command("voice:create").description("Create a voice from a previously designed preview").requiredOption("--sample <id>", "generated_voice_id from voice:design").option("--description <text>", "Optional voice description").option("--twin <idOrName>", "Target twin id or name").option("--json", "Output as JSON").action(async (opts) => {
+  program2.command("create").description("Create a voice from a previously designed preview").requiredOption("--sample <id>", "generated_voice_id from voice design").option("--description <text>", "Optional voice description").option("--twin <idOrName>", "Target twin id or name").option("--json", "Output as JSON").action(async (opts) => {
     const { twinId, auth } = twinFromFlag2(opts);
     const spinner = opts.json ? null : ora("Creating voice...").start();
     try {
@@ -20762,7 +20863,7 @@ function registerVoiceCommand(program2) {
       process.exit(1);
     }
   });
-  program2.command("voice:clone <source>").description("Clone a voice from an audio file (path | https URL | -)").option("--twin <idOrName>", "Target twin id or name").option("--name <filename>", "Override filename").option("--stdin", "Read from stdin (source must be -)").option("--json", "Output as JSON").action(async (source, opts) => {
+  program2.command("clone <source>").description("Clone a voice from an audio file (path | https URL | -)").option("--twin <idOrName>", "Target twin id or name").option("--name <filename>", "Override filename").option("--stdin", "Read from stdin (source must be -)").option("--json", "Output as JSON").action(async (source, opts) => {
     const { twinId, auth } = twinFromFlag2(opts);
     const spinner = opts.json ? null : ora("Reading audio...").start();
     try {
@@ -20790,13 +20891,13 @@ function registerVoiceCommand(program2) {
       process.exit(1);
     }
   });
-  program2.command("voice:reset").description("Reset the twin's voice to default").option("--twin <idOrName>", "Target twin id or name").option("--yes", "Skip confirmation").option("--json", "Output as JSON").action(async (opts) => {
+  program2.command("reset").description("Reset the twin's voice to default").option("--twin <idOrName>", "Target twin id or name").option("--yes", "Skip confirmation").option("--json", "Output as JSON").action(async (opts) => {
     const { twinId, auth } = twinFromFlag2(opts);
     await confirmDestructive({
       action: "Reset voice",
       detail: "This removes the custom voice. You can redesign or clone a new one later.",
       yes: opts.yes,
-      commandExample: "amiko voice:reset"
+      commandExample: "amiko voice reset"
     });
     const spinner = opts.json ? null : ora("Resetting voice...").start();
     try {
@@ -20813,7 +20914,7 @@ function registerVoiceCommand(program2) {
 
 // src/commands/avatar.ts
 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) => {
+  program2.command("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();
     let twinId;
@@ -20830,7 +20931,7 @@ function registerAvatarCommand(program2) {
       action: "Replace twin avatar",
       detail: "The twin's public avatar will change immediately.",
       yes: opts.yes,
-      commandExample: `amiko avatar:update --file ${opts.file}`
+      commandExample: `amiko avatar update --file ${opts.file}`
     });
     const spinner = opts.json ? null : ora("Reading image...").start();
     try {
@@ -20872,27 +20973,27 @@ 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) => {
+  program2.command("list").description("List friends").option("--type <user|twin>", "Filter by friend type").option("--json", "Output as JSON").action(async (opts) => {
     const auth = resolveAuth();
     const spinner = opts.json ? null : ora("Loading friends...").start();
     try {
       const data = await amikoWebFetch(auth, "/api/friends", { query: { type: opts.type } });
       spinner?.stop();
       renderOutput(data, (d) => {
-        const items = d.items ?? [];
+        const items = d.friends ?? [];
         if (items.length === 0) {
           console.log(dim("No friends."));
           return;
         }
         console.log(heading(`Friends (${items.length})`));
         const rows = [
-          [dim("ID"), dim("NAME"), dim("HANDLE"), dim("TYPE"), dim("STATUS")],
+          [dim("ID"), dim("NAME"), dim("HANDLE"), dim("TYPE"), dim("SINCE")],
           ...items.map((f) => [
-            f.id.slice(0, 8),
+            f.friendship_id.slice(0, 8),
             f.friend.name ?? "-",
             f.friend.handle ?? "-",
             f.friend.type,
-            f.status
+            f.since?.slice(0, 10) ?? "-"
           ])
         ];
         console.log(table(rows));
@@ -20903,7 +21004,7 @@ function registerFriendsCommand(program2) {
       process.exit(1);
     }
   });
-  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) => {
+  program2.command("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();
     const spinner = opts.json ? null : ora("Sending friend request...").start();
     try {
@@ -20923,7 +21024,7 @@ function registerFriendsCommand(program2) {
       process.exit(1);
     }
   });
-  program2.command("friends:accept <friendshipId>").description("Accept a pending friend request").option("--json", "Output as JSON").action(async (friendshipId, opts) => {
+  program2.command("accept <friendshipId>").description("Accept a pending friend request").option("--json", "Output as JSON").action(async (friendshipId, opts) => {
     const auth = resolveAuth();
     const spinner = opts.json ? null : ora("Accepting...").start();
     try {
@@ -20936,11 +21037,11 @@ function registerFriendsCommand(program2) {
       process.exit(1);
     }
   });
-  program2.command("friends:remove <friendshipId>").description("Remove a friend").option("--yes", "Skip confirmation").option("--json", "Output as JSON").action(async (friendshipId, opts) => {
+  program2.command("remove <friendshipId>").description("Remove a friend").option("--yes", "Skip confirmation").option("--json", "Output as JSON").action(async (friendshipId, opts) => {
     await confirmDestructive({
       action: `Remove friend ${friendshipId}`,
       yes: opts.yes,
-      commandExample: `amiko friends:remove ${friendshipId}`
+      commandExample: `amiko friends remove ${friendshipId}`
     });
     const auth = resolveAuth();
     const spinner = opts.json ? null : ora("Removing...").start();
@@ -20999,7 +21100,9 @@ function registerFeedCommand(program2) {
       process.exit(1);
     }
   });
-  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) => {
+}
+function registerPostCommand(program2) {
+  program2.command("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();
     const visibility = opts.visibility === "private" ? "private" : "public";
     const spinner = opts.json ? null : ora("Publishing post...").start();
@@ -21027,7 +21130,7 @@ function registerFeedCommand(program2) {
       process.exit(1);
     }
   });
-  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) => {
+  program2.command("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();
     let twinId;
@@ -21079,7 +21182,7 @@ function twinFromFlag3(opts) {
   }
 }
 function registerComposioCommand(program2) {
-  program2.command("composio:connect").description("Start Composio OAuth for an app (gmail, github, ...)").requiredOption("--app <slug>", "App name (e.g. gmail)").option("--twin <idOrName>", "Target twin id or name").option("--redirect <url>", "Override OAuth redirect URL").option("--force", "Force reconnect if already connected").option("--json", "Output as JSON").action(async (opts) => {
+  program2.command("connect").description("Start Composio OAuth for an app (gmail, github, ...)").requiredOption("--app <slug>", "App name (e.g. gmail)").option("--twin <idOrName>", "Target twin id or name").option("--redirect <url>", "Override OAuth redirect URL").option("--force", "Force reconnect if already connected").option("--json", "Output as JSON").action(async (opts) => {
     const { twinId, auth } = twinFromFlag3(opts);
     const spinner = opts.json ? null : ora(`Connecting ${opts.app}...`).start();
     try {
@@ -21115,13 +21218,13 @@ function registerComposioCommand(program2) {
       process.exit(1);
     }
   });
-  program2.command("composio:disconnect").description("Disconnect a Composio app for the twin").requiredOption("--app <slug>", "App name (e.g. gmail)").option("--twin <idOrName>", "Target twin id or name").option("--yes", "Skip confirmation").option("--json", "Output as JSON").action(async (opts) => {
+  program2.command("disconnect").description("Disconnect a Composio app for the twin").requiredOption("--app <slug>", "App name (e.g. gmail)").option("--twin <idOrName>", "Target twin id or name").option("--yes", "Skip confirmation").option("--json", "Output as JSON").action(async (opts) => {
     const { twinId, auth } = twinFromFlag3(opts);
     await confirmDestructive({
       action: `Disconnect ${opts.app}`,
       detail: "The twin will lose access to the app's tools until reconnected.",
       yes: opts.yes,
-      commandExample: `amiko composio:disconnect --app ${opts.app}`
+      commandExample: `amiko composio disconnect --app ${opts.app}`
     });
     const spinner = opts.json ? null : ora("Finding connection...").start();
     try {
@@ -21145,6 +21248,141 @@ function registerComposioCommand(program2) {
   });
 }
 
+// src/commands/wallets.ts
+function formatBalance(b) {
+  const n = Number(b.amount) / 10 ** b.decimals;
+  if (!isFinite(n))
+    return b.amount;
+  return n.toLocaleString(undefined, { maximumFractionDigits: 6 });
+}
+function registerWalletsBalanceCommand(program2) {
+  program2.command("balance <address>").description("Sync and show balance for a single wallet").option("--json", "Output raw JSON").action(async (address2, opts) => {
+    let auth;
+    try {
+      auth = requireAuth();
+    } catch (e) {
+      console.error(error(e instanceof Error ? e.message : String(e)));
+      process.exit(1);
+    }
+    const spinner = opts.json ? null : ora("Syncing wallet balance...").start();
+    try {
+      const data = await amikoWebFetch(auth, `/api/agents/${encodeURIComponent(auth.twinId)}/wallets/${encodeURIComponent(address2)}/balance`);
+      spinner?.stop();
+      if (opts.json) {
+        console.log(JSON.stringify(data, null, 2));
+        return;
+      }
+      console.log(heading("Wallet Balance"));
+      console.log("");
+      console.log(label("Address", data.walletAddress));
+      console.log(label("Chain", data.chain_type));
+      if (data.last_synced_at) {
+        console.log(label("Synced", data.last_synced_at));
+      }
+      const entries = Object.entries(data.balances || {});
+      if (entries.length === 0) {
+        console.log(dim("  No balances."));
+        return;
+      }
+      console.log("");
+      const rows = entries.map(([key, v]) => [`  ${key}`, formatBalance(v)]);
+      console.log(table(rows));
+    } catch (e) {
+      spinner?.stop();
+      console.error(error(e instanceof Error ? e.message : "Failed to fetch balance"));
+      process.exit(1);
+    }
+  });
+}
+function registerWalletsCreateCommand(program2) {
+  program2.command("create").description("Create a new wallet for the twin on solana or base").requiredOption("--chain <chain>", "Chain to create the wallet on (solana | base)").option("--custodian <custodian>", "Custodian (crossmint | amiko). Defaults to crossmint; amiko is solana-only.", "crossmint").option("--json", "Output raw JSON").action(async (opts) => {
+    const chain = opts.chain.toLowerCase();
+    if (!["solana", "base"].includes(chain)) {
+      console.error(error(`Unsupported chain '${opts.chain}'. Use solana or base.`));
+      process.exit(1);
+    }
+    let auth;
+    try {
+      auth = requireAuth();
+    } catch (e) {
+      console.error(error(e instanceof Error ? e.message : String(e)));
+      process.exit(1);
+    }
+    const spinner = opts.json ? null : ora(`Creating ${chain} wallet...`).start();
+    try {
+      const wallet = await amikoWebFetch(auth, `/api/agents/${encodeURIComponent(auth.twinId)}/wallets`, { method: "POST", body: { chain, custodian: opts.custodian } });
+      spinner?.stop();
+      if (opts.json) {
+        console.log(JSON.stringify(wallet, null, 2));
+        return;
+      }
+      console.log(success(`${chain} wallet created`));
+      console.log("");
+      console.log(label("Chain", `${wallet.chain} (${wallet.chain_type})`));
+      if (wallet.name)
+        console.log(label("Name", wallet.name));
+      console.log(label("Address", wallet.wallet_address));
+      console.log(label("Custodian", wallet.custodian ?? "-"));
+      console.log("");
+      console.log(dim(`Tip: paid commands (swap, markets search, image, amazon, services) will now use this wallet by default.`));
+    } catch (e) {
+      spinner?.stop();
+      const msg = e instanceof Error ? e.message : "Failed to create wallet";
+      if (/409|already/i.test(msg)) {
+        console.error(error(`An active ${chain} wallet already exists. Run \`amiko wallets list\` to see it.`));
+      } else {
+        console.error(error(msg));
+      }
+      process.exit(1);
+    }
+  });
+}
+function registerWalletsListCommand(program2) {
+  program2.command("list").alias("ls").description("List wallets for the authenticated twin").option("--json", "Output raw JSON").action(async (opts) => {
+    let auth;
+    try {
+      auth = requireAuth();
+    } catch (e) {
+      console.error(error(e instanceof Error ? e.message : String(e)));
+      process.exit(1);
+    }
+    const spinner = opts.json ? null : ora("Fetching wallets...").start();
+    try {
+      const data = await amikoWebFetch(auth, `/api/agents/${encodeURIComponent(auth.twinId)}/wallets`);
+      spinner?.stop();
+      if (opts.json) {
+        console.log(JSON.stringify(data, null, 2));
+        return;
+      }
+      const wallets = data.wallets || [];
+      if (wallets.length === 0) {
+        console.log(dim("No wallets found."));
+        return;
+      }
+      console.log(heading("Wallets"));
+      console.log("");
+      for (const w of wallets) {
+        console.log(label("Chain", `${w.chain} (${w.chain_type})`));
+        if (w.name)
+          console.log(label("Name", w.name));
+        console.log(label("Address", w.wallet_address));
+        console.log(label("Short", truncAddr(w.wallet_address)));
+        const balances = Object.entries(w.balance || {}).filter(([, v]) => Number(v.amount) > 0);
+        if (balances.length > 0) {
+          console.log(dim("  Balances:"));
+          const rows = balances.map(([key, v]) => [`    ${key}`, formatBalance(v)]);
+          console.log(table(rows));
+        }
+        console.log("");
+      }
+    } catch (e) {
+      spinner?.stop();
+      console.error(error(e instanceof Error ? e.message : "Failed to list wallets"));
+      process.exit(1);
+    }
+  });
+}
+
 // src/index.ts
 var require2 = createRequire2(import.meta.url);
 var { version: PKG_VERSION } = require2("../package.json");
@@ -21152,23 +21390,36 @@ var didOnboard = await runOnboarding(process.argv);
 if (didOnboard)
   process.exit(0);
 var program2 = new Command;
-program2.name("amiko").description("Amiko CLI — swap tokens, manage credits, bridge cross-chain, and call MPP services").version(PKG_VERSION);
+program2.name("amiko").description("Amiko CLI — swap tokens, manage credits, bridge cross-chain, and call marketplace services").version(PKG_VERSION);
+var markets = program2.command("markets").description("MPP marketplace — discover and call paid AMIKO services");
+var wallets = program2.command("wallets").description("Manage twin wallets — list, swap, bridge");
+var twin = program2.command("twin").description("Update twin identity (name, description, visibility)");
+var docs = program2.command("docs").description("Manage twin RAG documents — list, upload, delete, presign");
+var voice = program2.command("voice").description("Manage twin voice — design, create, clone, reset");
+var avatar = program2.command("avatar").description("Manage twin avatar image");
+var friends = program2.command("friends").description("Manage friendships — list, add, accept, remove");
+var post = program2.command("post").description("Create posts and comments on the feed");
+var composio = program2.command("composio").description("Manage Composio app connections");
 registerCreditsCommand(program2);
-registerSearchCommand(program2);
-registerImageCommand(program2);
-registerAmazonCommand(program2);
-registerSwapCommand(program2);
-registerBridgeCommand(program2);
+registerSearchCommand(markets);
+registerImageCommand(markets);
+registerAmazonCommand(markets);
+registerWalletsCreateCommand(wallets);
+registerWalletsListCommand(wallets);
+registerWalletsBalanceCommand(wallets);
+registerSwapCommand(wallets);
+registerBridgeCommand(wallets);
 registerConfigCommand(program2);
-registerServicesCommand(program2);
-registerDiscoveryCommand(program2);
+registerServicesCommand(markets);
+registerDiscoveryCommand(markets);
 registerUpdateCommand(program2);
 registerAccountsCommand(program2);
-registerTwinCommand(program2);
-registerDocsCommand(program2);
-registerVoiceCommand(program2);
-registerAvatarCommand(program2);
-registerFriendsCommand(program2);
+registerTwinCommand(twin);
+registerDocsCommand(docs);
+registerVoiceCommand(voice);
+registerAvatarCommand(avatar);
+registerFriendsCommand(friends);
 registerFeedCommand(program2);
-registerComposioCommand(program2);
+registerPostCommand(post);
+registerComposioCommand(composio);
 program2.parse();