@heyamiko/amiko-cli 0.9.0-beta.6 → 0.9.0

package/dist/index.js

@@ -18484,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();
@@ -18635,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);
@@ -18643,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);
@@ -18695,7 +18797,7 @@ function registerBridgeCommand(program2) {
       if (quote.swapTx) {
         console.log("");
         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}`));
+        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();
@@ -18703,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);
@@ -18711,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);
@@ -18974,81 +19080,6 @@ 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)
@@ -19295,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"));
@@ -19339,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"));
@@ -19453,14 +19486,15 @@ function registerSwapCommand(program2) {
         console.log(label("Route", dim(route)));
       }
       console.log("");
-      console.log(dim(`To execute: amiko wallets 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 {
@@ -19469,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);
@@ -19748,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 market 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 {
@@ -19770,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})...`;
@@ -19801,7 +19839,8 @@ function registerSearchCommand(program2) {
           "Content-Type": "application/json",
           "X-Payment-Tx": txHash,
           "X-Payment-Amount": amount2,
-          "X-Payment-Token": token
+          "X-Payment-Token": token,
+          "X-Twin-Id": auth.twinId
         }
       });
       spinner.stop();
@@ -19847,12 +19886,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 market image ${JSON.stringify(prompt)}`
+      commandExample: `amiko markets image ${JSON.stringify(prompt)}`
     });
     const isTTY = process.stderr.isTTY;
     const spinner = isTTY ? ora("Generating image...").start() : null;
@@ -19893,10 +19932,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...");
@@ -19922,7 +19963,8 @@ function registerImageCommand(program2) {
         method: "POST",
         headers: {
           "Content-Type": "application/json",
-          "X-Payment-Tx": txHash
+          "X-Payment-Tx": txHash,
+          "X-Twin-Id": auth.twinId
         },
         body: JSON.stringify({
           prompt,
@@ -19956,7 +19998,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 market 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)));
@@ -19986,12 +20028,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 market amazon search ${JSON.stringify(query)}`
+      commandExample: `amiko markets amazon search ${JSON.stringify(query)}`
     });
     const spinner = ora("Searching Amazon...").start();
     try {
@@ -20005,10 +20047,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...";
@@ -20018,7 +20062,7 @@ function registerAmazonCommand(program2) {
         q: `site:amazon.com ${query}`
       });
       const res = await fetch(`${mppBase2}/v1/search/google_shopping?${params}`, {
-        headers: { "X-Payment-Tx": txHash }
+        headers: { "X-Payment-Tx": txHash, "X-Twin-Id": auth.twinId }
       });
       spinner.stop();
       if (!res.ok) {
@@ -20166,7 +20210,8 @@ async function payAndCall(mppBase2, method, path2, auth, wallet, amountOrAuto, b
     throw new Error("Payment sent but no tx hash returned.");
   const headers = {
     "Content-Type": "application/json",
-    "X-Payment-Tx": txHash
+    "X-Payment-Tx": txHash,
+    "X-Twin-Id": auth.twinId
   };
   const fetchOpts = { method, headers };
   if (body && method !== "GET") {
@@ -20178,12 +20223,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 market service tts ${voiceId} ${JSON.stringify(text)}`
+      commandExample: `amiko markets service tts ${voiceId} ${JSON.stringify(text)}`
     });
     await callService({
       name: "Text-to-Speech",
@@ -20194,12 +20239,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 market service stt ${JSON.stringify(audioUrl)}`
+      commandExample: `amiko markets service stt ${JSON.stringify(audioUrl)}`
     });
     await callService({
       name: "Speech-to-Text",
@@ -20228,12 +20273,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 market 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)
@@ -20247,13 +20292,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 market 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) {
@@ -20312,10 +20357,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";
@@ -20448,7 +20495,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);
@@ -20483,7 +20530,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();
@@ -20605,6 +20652,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();
@@ -20618,20 +20677,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 {
@@ -20647,15 +20694,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.id,
             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) || "-"
           ])
         ];
@@ -20667,7 +20714,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 {
@@ -20718,13 +20765,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 {
@@ -20737,7 +20784,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 {
@@ -20765,7 +20812,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);
@@ -20785,7 +20832,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();
@@ -20793,7 +20840,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 {
@@ -20819,7 +20866,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 {
@@ -20847,13 +20894,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 {
@@ -20870,7 +20917,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;
@@ -20887,7 +20934,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 {
@@ -20929,27 +20976,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,
             f.friend.name ?? "-",
             f.friend.handle ?? "-",
             f.friend.type,
-            f.status
+            f.since?.slice(0, 10) ?? "-"
           ])
         ];
         console.log(table(rows));
@@ -20960,7 +21007,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 {
@@ -20980,7 +21027,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 {
@@ -20993,11 +21040,380 @@ 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("requests").description("List pending friend requests (incoming and outgoing)").option("--direction <incoming|outgoing|all>", "Filter direction", "all").option("--json", "Output as JSON").action(async (opts) => {
+    const auth = resolveAuth();
+    const spinner = opts.json ? null : ora("Loading requests...").start();
+    try {
+      const data = await amikoWebFetch(auth, "/api/friends/requests");
+      spinner?.stop();
+      renderOutput(data, (d) => {
+        const dir = opts.direction;
+        const showIn = dir === "all" || dir === "incoming";
+        const showOut = dir === "all" || dir === "outgoing";
+        const incoming = d.incoming ?? [];
+        const outgoing = d.outgoing ?? [];
+        if (showIn) {
+          console.log(heading(`Incoming (${incoming.length})`));
+          if (incoming.length === 0) {
+            console.log(dim("  none"));
+          } else {
+            const rows = [
+              [dim("FRIENDSHIP"), dim("FROM"), dim("HANDLE"), dim("SENT")],
+              ...incoming.map((r) => [
+                r.friendship_id,
+                r.user.name ?? "-",
+                r.user.handle ?? "-",
+                r.sent_at?.slice(0, 10) ?? "-"
+              ])
+            ];
+            console.log(table(rows));
+            console.log(dim(`
+Accept with: amiko friends accept <friendshipId>`));
+          }
+        }
+        if (showOut) {
+          if (showIn)
+            console.log();
+          console.log(heading(`Outgoing (${outgoing.length})`));
+          if (outgoing.length === 0) {
+            console.log(dim("  none"));
+          } else {
+            const rows = [
+              [dim("FRIENDSHIP"), dim("TO"), dim("HANDLE"), dim("SENT")],
+              ...outgoing.map((r) => [
+                r.friendship_id,
+                r.user.name ?? "-",
+                r.user.handle ?? "-",
+                r.sent_at?.slice(0, 10) ?? "-"
+              ])
+            ];
+            console.log(table(rows));
+          }
+        }
+      }, { json: opts.json });
+    } catch (e) {
+      spinner?.stop();
+      console.error(error(e instanceof Error ? e.message : String(e)));
+      process.exit(1);
+    }
+  });
+  const reports = program2.command("reports").description("Friend matching reports");
+  reports.command("list").description("List friend matching reports").option("--page <n>", "Page number", "1").option("--limit <n>", "Page size (1-50)", "20").option("--json", "Output as JSON").action(async (opts) => {
+    const auth = resolveAuth();
+    const spinner = opts.json ? null : ora("Loading reports...").start();
+    try {
+      const data = await amikoWebFetch(auth, "/api/friends/reports", {
+        query: { page: opts.page, limit: opts.limit }
+      });
+      spinner?.stop();
+      renderOutput(data, (d) => {
+        const items = d.items ?? [];
+        if (items.length === 0) {
+          console.log(dim("No reports."));
+          return;
+        }
+        console.log(heading(`Reports (${items.length}/${d.total ?? items.length})`));
+        const rows = [
+          [
+            dim("ID"),
+            dim("TYPE"),
+            dim("STATUS"),
+            dim("SCORE"),
+            dim("WITH"),
+            dim("CREATED")
+          ],
+          ...items.map((r) => {
+            const other = r.respondent ?? r.initiator;
+            return [
+              r.id,
+              r.report_type ?? "-",
+              r.status ?? "-",
+              r.score_preview != null ? String(r.score_preview) : "-",
+              other?.name ?? other?.handle ?? "-",
+              r.created_at?.slice(0, 10) ?? "-"
+            ];
+          })
+        ];
+        console.log(table(rows));
+      }, { json: opts.json });
+    } catch (e) {
+      spinner?.stop();
+      console.error(error(e instanceof Error ? e.message : String(e)));
+      process.exit(1);
+    }
+  });
+  reports.command("view <id>").description("View a friend matching report").option("--json", "Output as JSON").action(async (id, opts) => {
+    const auth = resolveAuth();
+    const spinner = opts.json ? null : ora("Loading report...").start();
+    try {
+      const data = await amikoWebFetch(auth, `/api/friends/reports/${encodeURIComponent(id)}`);
+      spinner?.stop();
+      renderOutput(data, (d) => {
+        const r = d.report;
+        console.log(heading(`Report ${r.id}`));
+        if (r.report_type)
+          console.log(label("Type", r.report_type));
+        if (r.status)
+          console.log(label("Status", r.status));
+        const other = r.respondent ?? r.initiator;
+        if (other)
+          console.log(label("With", other.name ?? other.handle ?? other.id));
+        if (r.created_at)
+          console.log(label("Created", r.created_at.slice(0, 10)));
+        if (r.teaser_text) {
+          console.log();
+          console.log(r.teaser_text);
+        }
+        if (r.report_json) {
+          console.log();
+          console.log(heading("Report"));
+          console.log(typeof r.report_json === "string" ? r.report_json : JSON.stringify(r.report_json, null, 2));
+        }
+      }, { json: opts.json });
+    } catch (e) {
+      spinner?.stop();
+      console.error(error(e instanceof Error ? e.message : String(e)));
+      process.exit(1);
+    }
+  });
+  reports.command("pending").description("List pending-consent report requests (awaiting my consent + awaiting theirs)").option("--limit <n>", "Page size (1-50)", "50").option("--json", "Output as JSON").action(async (opts) => {
+    const auth = resolveAuth();
+    const me = auth.userId;
+    if (!me && !opts.json) {
+      console.error(error("Current user id unknown — cannot split requests. Run `amiko accounts` to check."));
+      process.exit(1);
+    }
+    const spinner = opts.json ? null : ora("Loading...").start();
+    try {
+      const data = await amikoWebFetch(auth, "/api/friends/reports", {
+        query: { page: "1", limit: opts.limit }
+      });
+      spinner?.stop();
+      const items = (data.items ?? []).filter((r) => r.status === "pending_consent");
+      const incoming = items.filter((r) => r.respondent_id === me);
+      const outgoing = items.filter((r) => r.initiator_id === me);
+      renderOutput({ incoming, outgoing }, () => {
+        console.log(heading(`Awaiting my consent (${incoming.length})`));
+        if (incoming.length === 0) {
+          console.log(dim("  none"));
+        } else {
+          const rows = [
+            [
+              dim("REPORT ID"),
+              dim("TYPE"),
+              dim("FROM"),
+              dim("HANDLE"),
+              dim("SENT")
+            ],
+            ...incoming.map((r) => [
+              r.id,
+              r.report_type ?? "-",
+              r.initiator?.name ?? "-",
+              r.initiator?.handle ?? "-",
+              r.created_at?.slice(0, 10) ?? "-"
+            ])
+          ];
+          console.log(table(rows));
+          console.log(dim(`
+Consent with: amiko friends reports consent <reportId>`));
+        }
+        console.log();
+        console.log(heading(`Awaiting their consent (${outgoing.length})`));
+        if (outgoing.length === 0) {
+          console.log(dim("  none"));
+        } else {
+          const rows = [
+            [
+              dim("REPORT ID"),
+              dim("TYPE"),
+              dim("TO"),
+              dim("HANDLE"),
+              dim("SENT")
+            ],
+            ...outgoing.map((r) => [
+              r.id,
+              r.report_type ?? "-",
+              r.respondent?.name ?? "-",
+              r.respondent?.handle ?? "-",
+              r.created_at?.slice(0, 10) ?? "-"
+            ])
+          ];
+          console.log(table(rows));
+          console.log(dim(`
+Cancel with: amiko friends reports cancel <reportId>`));
+        }
+      }, { json: opts.json });
+    } catch (e) {
+      spinner?.stop();
+      console.error(error(e instanceof Error ? e.message : String(e)));
+      process.exit(1);
+    }
+  });
+  reports.command("request").description("Request a friend matching report (notifies the other user to consent)").requiredOption("--id <userId>", "Target user id (must be an accepted friend)").requiredOption("--type <friend|romantic|career>", "Report type").option("--yes", "Skip confirmation").option("--json", "Output as JSON").action(async (opts) => {
+    const allowed = ["friend", "romantic", "career"];
+    if (!allowed.includes(opts.type)) {
+      console.error(error(`--type must be one of: ${allowed.join(", ")}`));
+      process.exit(1);
+    }
+    await confirmDestructive({
+      action: `Request a ${opts.type} matching report with user ${opts.id} (they will be notified)`,
+      yes: opts.yes,
+      commandExample: `amiko friends reports request --id ${opts.id} --type ${opts.type}`
+    });
+    const auth = resolveAuth();
+    const spinner = opts.json ? null : ora("Requesting report...").start();
+    try {
+      const data = await amikoWebFetch(auth, "/api/friends/reports", {
+        method: "POST",
+        body: { friend_id: opts.id, report_type: opts.type }
+      });
+      spinner?.stop();
+      renderOutput(data, (d) => {
+        if (d.report) {
+          console.log(success(`Report requested (${d.report.report_type})`));
+          console.log(label("Report ID", d.report.id));
+          console.log(label("Status", d.report.status));
+          console.log(dim(`
+The other user will be notified and must consent before the report is generated.`));
+        }
+      }, { json: opts.json });
+    } catch (e) {
+      spinner?.stop();
+      console.error(error(e instanceof Error ? e.message : String(e)));
+      process.exit(1);
+    }
+  });
+  for (const action of ["consent", "cancel", "retry"]) {
+    const desc = {
+      consent: "Consent to a report request (respondent only)",
+      cancel: "Cancel a pending report",
+      retry: "Retry a failed report generation"
+    };
+    reports.command(`${action} <id>`).description(desc[action]).option("--json", "Output as JSON").action(async (id, opts) => {
+      const auth = resolveAuth();
+      const spinner = opts.json ? null : ora(`${action}...`).start();
+      try {
+        const data = await amikoWebFetch(auth, `/api/friends/reports/${encodeURIComponent(id)}`, { method: "PATCH", body: { action } });
+        spinner?.stop();
+        renderOutput(data, (d) => {
+          console.log(success(`${action} ok`));
+          if (d.status)
+            console.log(label("Status", d.status));
+        }, { json: opts.json });
+      } catch (e) {
+        spinner?.stop();
+        console.error(error(e instanceof Error ? e.message : String(e)));
+        process.exit(1);
+      }
+    });
+  }
+  program2.command("find").description("Find matches for a custom relationship description (LLM-generated, on-demand)").requiredOption("--relationship <text>", 'Relationship description, e.g. "cofounder who is good at design"').option("--rationale <text>", "Optional extra context for the matcher").option("--limit <n>", "Max results (1-20)", "10").option("--json", "Output as JSON").action(async (opts) => {
+    const limitNum = Math.max(1, Math.min(20, Number(opts.limit) || 10));
+    const auth = resolveAuth();
+    const spinner = opts.json ? null : ora("Finding matches (may take ~10s)...").start();
+    try {
+      const data = await amikoWebFetch(auth, "/api/user/personality-profile/matches", {
+        method: "POST",
+        body: {
+          relationship_type: opts.relationship,
+          rationale: opts.rationale,
+          limit: limitNum
+        }
+      });
+      spinner?.stop();
+      renderOutput(data, (d) => {
+        const matches = d.matches ?? [];
+        if (matches.length === 0) {
+          console.log(dim("No matches."));
+          if (d.no_match_reason)
+            console.log(dim(d.no_match_reason));
+          return;
+        }
+        console.log(heading(`Matches for "${opts.relationship}" (${matches.length})`));
+        const rows = [
+          [
+            dim("USER"),
+            dim("NAME"),
+            dim("SCORE"),
+            dim("STATUS"),
+            dim("PAIRING")
+          ],
+          ...matches.map((m) => [
+            m.user_id,
+            m.display_name ?? "-",
+            m.score.toFixed(3),
+            m.friendship_status ?? "none",
+            m.pairing_label ?? "-"
+          ])
+        ];
+        console.log(table(rows));
+        for (const m of matches) {
+          if (m.compatibility_highlights?.length) {
+            console.log();
+            console.log(label(m.display_name ?? m.user_id, m.compatibility_highlights.join("; ")));
+          }
+        }
+      }, { json: opts.json });
+    } catch (e) {
+      spinner?.stop();
+      console.error(error(e instanceof Error ? e.message : String(e)));
+      process.exit(1);
+    }
+  });
+  program2.command("matches").description("List friend matches").option("--limit <n>", "Max results (1-50)", "10").option("--offset <n>", "Offset", "0").option("--relationship-type <type>", "Filter by relationship type").option("--dimension <dimension>", "Filter by match dimension").option("--json", "Output as JSON").action(async (opts) => {
+    const auth = resolveAuth();
+    const spinner = opts.json ? null : ora("Loading matches...").start();
+    try {
+      const data = await amikoWebFetch(auth, "/api/friends/matches", {
+        query: {
+          limit: opts.limit,
+          offset: opts.offset,
+          relationship_type: opts.relationshipType,
+          dimension: opts.dimension
+        }
+      });
+      spinner?.stop();
+      renderOutput(data, (d) => {
+        const items = d.items ?? [];
+        if (items.length === 0) {
+          console.log(dim("No matches."));
+          return;
+        }
+        console.log(heading(`Matches (${items.length}/${d.total ?? items.length})`));
+        const rows = [
+          [
+            dim("USER"),
+            dim("NAME"),
+            dim("REL"),
+            dim("DIM"),
+            dim("SCORE"),
+            dim("STATUS")
+          ],
+          ...items.map((m) => [
+            m.matched_user_id,
+            m.display_name ?? m.handle ?? "-",
+            m.relationship_type ?? "-",
+            m.match_dimension ?? "-",
+            m.score != null ? String(m.score) : "-",
+            m.friendship_status ?? "-"
+          ])
+        ];
+        console.log(table(rows));
+        if (d.has_more)
+          console.log(dim(`
+(more available)`));
+      }, { json: opts.json });
+    } catch (e) {
+      spinner?.stop();
+      console.error(error(e instanceof Error ? e.message : String(e)));
+      process.exit(1);
+    }
+  });
+  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();
@@ -21013,6 +21429,85 @@ function registerFriendsCommand(program2) {
   });
 }
 
+// src/commands/users.ts
+function registerUsersCommand(program2) {
+  program2.command("search <query>").description("Search for users by name or handle").option("--limit <n>", "Max results (1-20)", "10").option("--cursor <cursor>", "Pagination cursor").option("--json", "Output as JSON").action(async (query, opts) => {
+    const auth = resolveAuth();
+    const spinner = opts.json ? null : ora("Searching users...").start();
+    try {
+      const data = await amikoWebFetch(auth, "/api/search", {
+        query: {
+          q: query,
+          type: "people",
+          limit: opts.limit,
+          cursor: opts.cursor
+        }
+      });
+      spinner?.stop();
+      renderOutput(data, (d) => {
+        const items = d.users ?? [];
+        if (items.length === 0) {
+          console.log(dim("No users found."));
+          return;
+        }
+        console.log(heading(`Users (${items.length})`));
+        const rows = [
+          [dim("ID"), dim("NAME"), dim("HANDLE")],
+          ...items.map((u) => [
+            u.id,
+            u.name ?? "-",
+            u.handle ?? "-"
+          ])
+        ];
+        console.log(table(rows));
+        if (d.hasMore && d.nextCursor) {
+          console.log(dim(`
+Next cursor: ${d.nextCursor}`));
+        }
+      }, { json: opts.json });
+    } catch (e) {
+      spinner?.stop();
+      console.error(error(e instanceof Error ? e.message : String(e)));
+      process.exit(1);
+    }
+  });
+  program2.command("profile <handle>").description("View a user's public profile").option("--json", "Output as JSON").action(async (handle, opts) => {
+    const auth = resolveAuth();
+    const spinner = opts.json ? null : ora("Loading profile...").start();
+    try {
+      const data = await amikoWebFetch(auth, `/api/users/${encodeURIComponent(handle)}`);
+      spinner?.stop();
+      renderOutput(data, (d) => {
+        const u = d.user;
+        console.log(heading(u.name ?? u.handle ?? u.id));
+        console.log(label("ID", u.id));
+        if (u.handle)
+          console.log(label("Handle", u.handle));
+        if (u.created_at)
+          console.log(label("Joined", u.created_at.slice(0, 10)));
+        if (u.last_seen_at)
+          console.log(label("Last seen", u.last_seen_at.slice(0, 10)));
+        if (u.twins && u.twins.length > 0) {
+          console.log(heading(`
+Twins (${u.twins.length})`));
+          for (const t of u.twins) {
+            console.log(`  ${t.name ?? "-"}  ${dim(t.handle ?? t.id.slice(0, 8))}`);
+          }
+        }
+        if (Array.isArray(u.mutual_friends) && u.mutual_friends.length > 0) {
+          console.log(label("Mutual friends", String(u.mutual_friends.length)));
+        } else if (typeof u.mutual_friends === "number") {
+          console.log(label("Mutual friends", String(u.mutual_friends)));
+        }
+      }, { json: opts.json });
+    } catch (e) {
+      spinner?.stop();
+      console.error(error(e instanceof Error ? e.message : String(e)));
+      process.exit(1);
+    }
+  });
+}
+
 // 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) => {
@@ -21056,7 +21551,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();
@@ -21084,7 +21581,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;
@@ -21136,7 +21633,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 {
@@ -21172,13 +21669,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 {
@@ -21248,6 +21745,49 @@ function registerWalletsBalanceCommand(program2) {
     }
   });
 }
+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;
@@ -21302,26 +21842,37 @@ if (didOnboard)
   process.exit(0);
 var program2 = new Command;
 program2.name("amiko").description("Amiko CLI — swap tokens, manage credits, bridge cross-chain, and call marketplace services").version(PKG_VERSION);
-var market = program2.command("market").description("MPP marketplace — discover and call paid AMIKO services");
+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, requests, add, accept, remove, reports, matches");
+var users = program2.command("users").description("Search users and view public profiles");
+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(market);
-registerImageCommand(market);
-registerAmazonCommand(market);
+registerSearchCommand(markets);
+registerImageCommand(markets);
+registerAmazonCommand(markets);
+registerWalletsCreateCommand(wallets);
 registerWalletsListCommand(wallets);
 registerWalletsBalanceCommand(wallets);
 registerSwapCommand(wallets);
 registerBridgeCommand(wallets);
 registerConfigCommand(program2);
-registerServicesCommand(market);
-registerDiscoveryCommand(market);
+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);
+registerUsersCommand(users);
 registerFeedCommand(program2);
-registerComposioCommand(program2);
+registerPostCommand(post);
+registerComposioCommand(composio);
 program2.parse();