@heyamiko/amiko-cli 0.3.5 → 0.3.6

package/README.md

@@ -30,6 +30,9 @@ amiko credits balance
 # Top up credits from your agent's wallet
 amiko credits topup 10000 --token AMIKO --yes
 
+# Swap tokens on Solana
+amiko swap send 1 amiko usdc
+
 # Browse and call marketplace agents
 amiko browse
 amiko call titan-research "Summarize the latest AI news"
@@ -45,7 +48,7 @@ amiko connect amk_<key>           # API key (shown once at creation)
 amiko connect                     # browser sign-in flow
 ```
 
-The connect code is the simplest — generate one from your Amiko settings page, paste it to the agent or terminal.
+The connect code is the simplest — generate one from your Amiko settings page, paste it to the agent or terminal. Connect auto-detects your Solana wallet for swaps.
 
 ```bash
 amiko whoami                      # show current auth status
@@ -124,18 +127,19 @@ amiko creator payout              # request payout
 
 ## Swap (Solana)
 
-Swap tokens on Solana via Jupiter aggregator (0.1% platform fee):
+Swap tokens on Solana via Jupiter aggregator. Wallet auto-detected from your connected account — no setup needed.
 
 ```bash
-amiko swap quote 5 usdt usdc      # get swap quote
-amiko swap quote 0.1 sol usdc     # SOL → USDC quote
-amiko swap quote 1 amiko usdc     # AMIKO → USDC quote
-amiko swap send 5 usdt usdc       # build swap transaction
-amiko swap send 5 usdt usdc --raw # output raw base64 tx
+amiko swap send 1 amiko usdc      # swap 1 AMIKO → USDC (auto-detect wallet)
+amiko swap send 5 usdt usdc --yes # skip confirmation
+amiko swap send 0.1 sol usdc      # SOL → USDC
+amiko swap quote 1 amiko usdc     # preview without executing
 amiko swap tokens                 # list supported tokens
 ```
 
-Supports symbols (sol, usdc, usdt, amiko, bonk, jup, ...) or raw mint addresses.
+Supports symbols (`sol`, `usdc`, `usdt`, `amiko`, `bonk`, `jup`, `pyusd`, `jitosol`, `ray`, `wbtc`) or raw mint addresses.
+
+Swaps execute via Crossmint smart wallets — your agent wallet signs and submits on-chain automatically.
 
 ## Bridge (Cross-Chain)
 
@@ -170,9 +174,10 @@ npm install -g @heyamiko/amiko-cli
 amiko connect <CODE>
 amiko credits balance
 amiko credits topup 10000 --token AMIKO --yes
+amiko swap send 1 amiko usdc       # swap tokens on Solana
 ```
 
-The CLI auto-detects `.amiko.json` (synced by the platform) when running on an agent.
+Connect auto-detects the agent's Solana wallet — no manual wallet setup needed. The CLI auto-detects `.amiko.json` (synced by the platform) when running on an agent.
 
 ## Configuration
 

package/dist/index.js

@@ -3603,6 +3603,80 @@ var require_emoji_regex = __commonJS((exports, module) => {
   };
 });
 
+// src/lib/agent-config.ts
+var exports_agent_config = {};
+__export(exports_agent_config, {
+  resolveAuth: () => resolveAuth,
+  loadAgentConfig: () => loadAgentConfig
+});
+import { existsSync as existsSync3, readFileSync as readFileSync2 } from "node:fs";
+import { join as join3, resolve } from "node:path";
+function loadAgentConfig() {
+  let dir = process.cwd();
+  const root = resolve("/");
+  while (dir !== root) {
+    const filePath = join3(dir, ".amiko.json");
+    if (existsSync3(filePath)) {
+      try {
+        const raw = readFileSync2(filePath, "utf-8");
+        const parsed = JSON.parse(raw);
+        const config = {};
+        if (parsed.amikoTwinToken)
+          config.twinToken = parsed.amikoTwinToken;
+        if (parsed.amikoTwinId)
+          config.twinId = parsed.amikoTwinId;
+        if (parsed.amikoUserId)
+          config.userId = parsed.amikoUserId;
+        if (parsed.amikoPlatformUrl)
+          config.platformUrl = parsed.amikoPlatformUrl;
+        return Object.keys(config).length > 0 ? config : null;
+      } catch {
+        return null;
+      }
+    }
+    dir = resolve(dir, "..");
+  }
+  return null;
+}
+function resolveAuth(cliConfig) {
+  if (cliConfig.agentWallets?.length) {
+    return {
+      mode: "connected",
+      platformUrl: cliConfig.platformUrl,
+      billingBase: cliConfig.billingBase,
+      twinId: cliConfig.twinId,
+      twinToken: cliConfig.twinToken,
+      platformKey: cliConfig.apiKey,
+      privyToken: cliConfig.privyToken,
+      connectedKeyId: cliConfig.connectedKeyId,
+      userId: cliConfig.userId,
+      agentWallets: cliConfig.agentWallets
+    };
+  }
+  if (cliConfig.privyToken && cliConfig.connectedKeyId) {
+    return {
+      mode: "connected",
+      billingBase: cliConfig.billingBase,
+      platformKey: cliConfig.privyToken,
+      privyToken: cliConfig.privyToken,
+      connectedKeyId: cliConfig.connectedKeyId,
+      userId: cliConfig.userId
+    };
+  }
+  const agentConfig = loadAgentConfig();
+  if (agentConfig?.twinToken) {
+    return {
+      mode: "agent",
+      platformUrl: agentConfig.platformUrl,
+      twinId: agentConfig.twinId,
+      twinToken: agentConfig.twinToken,
+      userId: agentConfig.userId
+    };
+  }
+  return { mode: "none" };
+}
+var init_agent_config = () => {};
+
 // node_modules/@solana/errors/dist/index.node.mjs
 function getHumanReadableErrorMessage(code, context = {}) {
   const messageFormatString = SolanaErrorMessages[code];
@@ -21107,7 +21181,7 @@ function nonoptional(innerType, params) {
     ...normalizeParams(params)
   });
 }
-function success3(innerType) {
+function success2(innerType) {
   return new ZodMiniSuccess({
     type: "success",
     innerType
@@ -21630,7 +21704,7 @@ __export(exports_external, {
   templateLiteral: () => templateLiteral,
   symbol: () => symbol,
   superRefine: () => superRefine,
-  success: () => success3,
+  success: () => success2,
   stringbool: () => stringbool,
   stringFormat: () => stringFormat,
   string: () => string2,
@@ -21891,7 +21965,7 @@ __export(exports_zod, {
   templateLiteral: () => templateLiteral,
   symbol: () => symbol,
   superRefine: () => superRefine,
-  success: () => success3,
+  success: () => success2,
   stringbool: () => stringbool,
   stringFormat: () => stringFormat,
   string: () => string2,
@@ -26464,60 +26538,98 @@ function registerSwapCommand(program2) {
       process.exit(1);
     }
   });
-  cmd.command("send").description("Execute a token swap on Solana").argument("<amount>", "Amount to swap (e.g., 5, 0.1)").argument("<from>", "Input token (sol, usdc, usdt, bonk, or mint address)").argument("<to>", "Output token (sol, usdc, usdt, bonk, or mint address)").option("--wallet <address>", "Wallet address (uses config wallet by default)").option("--slippage <bps>", "Slippage tolerance in basis points", "50").option("--raw", "Output raw transaction base64 for manual signing").action(async (amountStr, fromToken, toToken, opts) => {
-    const spinner = ora("Building swap transaction...").start();
+  cmd.command("send").description("Execute a token swap on Solana via Crossmint wallet").argument("<amount>", "Amount to swap (e.g., 5, 0.1)").argument("<from>", "Input token (sol, usdc, usdt, amiko, bonk, or mint address)").argument("<to>", "Output token (sol, usdc, usdt, amiko, bonk, or mint address)").option("--wallet <address>", "Wallet address (uses config wallet by default)").option("--slippage <bps>", "Slippage tolerance in basis points", "50").option("--yes", "Skip confirmation").action(async (amountStr, fromToken, toToken, opts) => {
     try {
       const { loadConfig: loadConfig2 } = await Promise.resolve().then(() => (init_config(), exports_config));
+      const { resolveAuth: resolveAuth2 } = await Promise.resolve().then(() => (init_agent_config(), exports_agent_config));
       const config = loadConfig2();
-      const wallet = opts.wallet || config.wallet;
+      const auth = resolveAuth2(config);
+      const solanaAgentWallet = config.agentWallets?.find((w) => w.chain === "solana" && w.source === "agent")?.address;
+      const wallet = opts.wallet || config.wallet || solanaAgentWallet;
       if (!wallet) {
-        spinner.stop();
-        console.error(error("No wallet address. Provide --wallet or set one: amiko config set wallet <address>"));
+        console.error(error("No Solana wallet found. Provide --wallet or run: amiko connect"));
+        process.exit(1);
+      }
+      if (auth.mode === "none") {
+        console.error(error("Not connected. Run: amiko connect"));
         process.exit(1);
       }
       const input = resolveToken(fromToken);
       const output = resolveToken(toToken);
       const amount = parseAmount(amountStr, input.decimals);
-      const params = new URLSearchParams({
+      const quoteSpinner = ora("Fetching swap quote...").start();
+      const quoteParams = new URLSearchParams({
         inputMint: input.mint,
         outputMint: output.mint,
         amount,
         slippageBps: opts.slippage
       });
-      const quote = await get(`/v1/swap/quote?${params}`);
-      const txResponse = await post("/v1/swap/transaction", {
-        quoteResponse: quote,
-        userPublicKey: wallet
-      });
-      spinner.stop();
-      console.log(heading("Swap Transaction"));
+      const quote = await get(`/v1/swap/quote?${quoteParams}`);
+      quoteSpinner.stop();
+      console.log(heading("Swap"));
       console.log("");
-      console.log(label("Swap", `${formatAmount(quote.inAmount, input.decimals)} ${input.symbol} → ${formatAmount(quote.outAmount, output.decimals)} ${output.symbol}`));
+      console.log(label("Send", `${formatAmount(quote.inAmount, input.decimals)} ${input.symbol}`));
+      console.log(label("Receive", `~${formatAmount(quote.outAmount, output.decimals)} ${output.symbol}`));
+      if (quote.platformFee && parseInt(quote.platformFee.amount) > 0) {
+        console.log(label("Fee", `${formatAmount(quote.platformFee.amount, output.decimals)} ${output.symbol} (${quote.platformFee.feeBps} bps)`));
+      }
+      const route = quote.routePlan.map((r) => r.swapInfo.label).join(" → ");
+      if (route)
+        console.log(label("Route", dim(route)));
       console.log(label("Wallet", truncAddr(wallet)));
-      if (txResponse.simulationError) {
-        console.log(warn(`Simulation warning: ${txResponse.simulationError.error}`));
+      console.log("");
+      if (!opts.yes) {
+        const readline = await import("readline");
+        const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+        const answer = await new Promise((resolve2) => rl.question("Confirm swap? (y/N) ", resolve2));
+        rl.close();
+        if (answer.toLowerCase() !== "y") {
+          console.log(dim("Cancelled."));
+          process.exit(0);
+        }
+      }
+      const swapSpinner = ora("Executing swap via Crossmint...").start();
+      const billingToken = auth.platformKey || auth.privyToken;
+      const billingBase2 = auth.billingBase;
+      if (!billingBase2 || !billingToken) {
+        swapSpinner.stop();
+        console.error(error("No billing credentials. Run: amiko connect"));
+        process.exit(1);
       }
-      if (opts.raw) {
-        console.log("");
-        console.log(heading("Raw Transaction (base64)"));
-        console.log(txResponse.swapTransaction);
-        console.log("");
-        console.log(label("Block Height", String(txResponse.lastValidBlockHeight)));
-        console.log(label("CU Limit", String(txResponse.computeUnitLimit)));
-        console.log("");
-        console.log(dim("Sign and submit this transaction with your wallet."));
-        return;
+      const swapRes = await fetch(`${billingBase2}/api/crossmint/wallets/${encodeURIComponent(wallet)}/swap`, {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json",
+          Authorization: `Bearer ${billingToken}`
+        },
+        body: JSON.stringify({
+          inputMint: input.mint,
+          outputMint: output.mint,
+          amount,
+          slippageBps: parseInt(opts.slippage)
+        })
+      });
+      if (!swapRes.ok) {
+        swapSpinner.stop();
+        const err = await swapRes.json().catch(() => ({ error: "Swap failed" }));
+        console.error(error(err.error || `Swap failed: ${swapRes.status}`));
+        if (err.details)
+          console.error(dim(typeof err.details === "string" ? err.details : JSON.stringify(err.details)));
+        process.exit(1);
       }
+      const swapData = await swapRes.json();
+      swapSpinner.stop();
+      console.log(success("Swap executed"));
       console.log("");
-      console.log(heading("Transaction Ready"));
-      console.log("");
-      console.log(dim("Sign and submit with your Solana wallet:"));
-      console.log("");
-      console.log(`  ${source_default.cyan("amiko swap send")} ${amountStr} ${fromToken} ${toToken} --raw | solana-keygen sign`);
-      console.log("");
-      console.log(dim("Or use --raw to get the base64 transaction for any wallet."));
+      if (swapData.txHash) {
+        console.log(label("Tx Hash", dim(swapData.txHash)));
+        console.log(label("Explorer", dim(swapData.explorerLink || `https://solscan.io/tx/${swapData.txHash}`)));
+      }
+      if (swapData.quote) {
+        console.log(label("Input", `${formatAmount(swapData.quote.inAmount, input.decimals)} ${input.symbol}`));
+        console.log(label("Output", `${formatAmount(swapData.quote.outAmount, output.decimals)} ${output.symbol}`));
+      }
     } catch (err) {
-      spinner.stop();
       console.error(error(err instanceof Error ? err.message : "Swap failed"));
       process.exit(1);
     }
@@ -26603,8 +26715,15 @@ function saveCredentials(data) {
     update.connectedKeyPreview = data.connectedKeyPreview;
   if (data.connectedKeyName)
     update.connectedKeyName = data.connectedKeyName;
-  if (data.wallets)
+  if (data.wallets) {
     update.agentWallets = data.wallets;
+    const currentConfig = loadConfig();
+    if (!currentConfig.wallet) {
+      const solWallet = data.wallets.find((w) => w.chain === "solana" && w.source === "agent");
+      if (solWallet)
+        update.wallet = solWallet.address;
+    }
+  }
   saveConfig(update);
 }
 function registerConnectCommand(program2) {
@@ -26733,74 +26852,7 @@ Tip: you can also generate a connect link from your Amiko settings`));
 
 // src/commands/credits.ts
 init_config();
-
-// src/lib/agent-config.ts
-import { existsSync as existsSync3, readFileSync as readFileSync2 } from "node:fs";
-import { join as join3, resolve } from "node:path";
-function loadAgentConfig() {
-  let dir = process.cwd();
-  const root = resolve("/");
-  while (dir !== root) {
-    const filePath = join3(dir, ".amiko.json");
-    if (existsSync3(filePath)) {
-      try {
-        const raw = readFileSync2(filePath, "utf-8");
-        const parsed = JSON.parse(raw);
-        const config = {};
-        if (parsed.amikoTwinToken)
-          config.twinToken = parsed.amikoTwinToken;
-        if (parsed.amikoTwinId)
-          config.twinId = parsed.amikoTwinId;
-        if (parsed.amikoUserId)
-          config.userId = parsed.amikoUserId;
-        if (parsed.amikoPlatformUrl)
-          config.platformUrl = parsed.amikoPlatformUrl;
-        return Object.keys(config).length > 0 ? config : null;
-      } catch {
-        return null;
-      }
-    }
-    dir = resolve(dir, "..");
-  }
-  return null;
-}
-function resolveAuth(cliConfig) {
-  if (cliConfig.agentWallets?.length) {
-    return {
-      mode: "connected",
-      platformUrl: cliConfig.platformUrl,
-      billingBase: cliConfig.billingBase,
-      twinId: cliConfig.twinId,
-      twinToken: cliConfig.twinToken,
-      platformKey: cliConfig.apiKey,
-      privyToken: cliConfig.privyToken,
-      connectedKeyId: cliConfig.connectedKeyId,
-      userId: cliConfig.userId,
-      agentWallets: cliConfig.agentWallets
-    };
-  }
-  if (cliConfig.privyToken && cliConfig.connectedKeyId) {
-    return {
-      mode: "connected",
-      billingBase: cliConfig.billingBase,
-      platformKey: cliConfig.privyToken,
-      privyToken: cliConfig.privyToken,
-      connectedKeyId: cliConfig.connectedKeyId,
-      userId: cliConfig.userId
-    };
-  }
-  const agentConfig = loadAgentConfig();
-  if (agentConfig?.twinToken) {
-    return {
-      mode: "agent",
-      platformUrl: agentConfig.platformUrl,
-      twinId: agentConfig.twinId,
-      twinToken: agentConfig.twinToken,
-      userId: agentConfig.userId
-    };
-  }
-  return { mode: "none" };
-}
+init_agent_config();
 
 // src/lib/mpp-topup.ts
 init_config();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@heyamiko/amiko-cli",
-  "version": "0.3.5",
+  "version": "0.3.6",
   "description": "Amiko CLI — manage agents, wallets, credits, and marketplace on the MPP payment rail",
   "type": "module",
   "bin": {