@heyamiko/amiko-cli 0.12.0-beta.7 → 0.14.0-beta.1

package/README.md

@@ -1,4 +1,4 @@
-# @heyamiko/amiko-cli (v0.12.0-beta.7)
+# @heyamiko/amiko-cli (v0.14.0-beta.0)
 
 Manage wallets, credits, swaps, MPP marketplace services, and your Amiko twin (identity, documents, voice, avatar, friends, feed) from the terminal. Works for both human users and AI agents running on OpenClaw.
 
@@ -47,6 +47,7 @@ amiko wallets swap send 1.0 SOL USDC --yes
 # Call any MPP service
 amiko markets service list
 amiko markets service call POST /v1/sfx '{"text":"thunder","duration_seconds":5}'
+amiko markets service call GET /v1/x/search?q=ai --usdt auto   # pay any endpoint in USDT
 ```
 
 ## Credits
@@ -93,12 +94,13 @@ amiko credits topup 10000 --wallet Gu2b...QVya        # specific wallet (else de
 ## Search
 
 ```bash
-amiko markets search "AI agents"                 # search X/Twitter (1 AMIKO)
-amiko markets search "bitcoin" --token USDC      # pay with USDC instead
+amiko markets search "AI agents"                 # search X/Twitter ($0.01 in AMIKO at spot)
+amiko markets search "bitcoin" --token USDT      # pay 0.01 USDT directly (no swap)
+amiko markets search "solana" --token USDC       # or USDC
 amiko markets search "news" --raw                # raw JSON output
 ```
 
-Pays 1 AMIKO per search via Crossmint wallet transfer. Tries Solana wallet first, falls back to EVM.
+Each search is anchored at $0.01. The CLI quotes the real token amount before the approval gate — AMIKO converts at the live platform spot; USDC/USDT are pinned at $1.00 so the amount equals the USD price. Payment is a Crossmint wallet transfer from your Solana wallet; the tx rides to MPP as `X-Payment-Tx` + `X-Payment-Token`.
 
 ## Image Generation
 
@@ -253,7 +255,8 @@ amiko card mint <slug> --status                   # check an existing mint
 ## Amazon
 
 ```bash
-amiko markets amazon search "usb c cable"        # product search (1 AMIKO)
+amiko markets amazon search "usb c cable"        # product search ($0.01)
+amiko markets amazon search "ssd" --token USDT   # pay in USDT directly
 amiko markets amazon quote B01GGKYKQM            # price quote (free)
 ```
 
@@ -525,6 +528,10 @@ npm publish
 
 ## Changelog
 
+### 0.14.0-beta.0
+
+- **Direct USDC/USDT payment for MPP marketplace services (Bug #9).** `markets search`, `markets image`, and `markets amazon search` gain `--token <AMIKO|USDC|USDT>`; `markets service call` completes its `--usdc` path and adds `--usdt` (both accept `auto` to price from the endpoint's USD anchor). Stables are pinned at $1.00 — no forced swap to AMIKO and no credits conversion. Requires the matching mpp-service deploy: `charge()`/`chargeAmiko()` now read `X-Payment-Token` and verify the on-chain transfer against that token's mint (`verifySplTransfer`), with a ±0.5% tolerance for stables (±5% stays for AMIKO spot drift). Also fixes stale hardcoded amounts: `markets search` / `amazon search` paid a flat "1 AMIKO" regardless of spot — under current prices that under-pays the $0.01 anchor and fails verification; amounts are now quoted live before the approval gate, which shows the real cost instead of "1 AMIKO". Shared payment plumbing extracted to `src/lib/treasury-payment.ts` (one TREASURY constant, one transfer path).
+
 ### 0.11.0-beta.3
 
 - **`amiko composio` removed (breaking).** The Composio OAuth-connection commands (`composio connect`, `composio disconnect`) are gone — `src/commands/composio.ts` deleted, `composio` command group dropped from `src/index.ts`. SKILL.md frontmatter, command-groups list, `--yes`-gated list, and the dedicated `## Composio` block are all removed; README's lead paragraph, architecture tree, destructive-ops list, Platform-table row, and Composio code-block example are updated to match. Scripts that called `amiko composio ...` will now error with "unknown command".

package/dist/index.js

@@ -28306,15 +28306,60 @@ async function reportHttpError(res, label2) {
   console.error(String(pretty).slice(0, 2000));
 }
 
-// src/commands/search.ts
+// src/lib/treasury-payment.ts
 var TREASURY = "FPiZAf3jEnNfCwfvbv46jdPfHbmSepD4Q6iHiLJDQXvb";
+var PAYMENT_TOKENS = ["AMIKO", "USDC", "USDT"];
+function normalizePaymentToken(raw) {
+  const sym = (raw ?? "AMIKO").trim().toUpperCase();
+  if (!PAYMENT_TOKENS.includes(sym)) {
+    throw new Error(`Unsupported payment token "${raw}". Supported: ${PAYMENT_TOKENS.join(", ")}.`);
+  }
+  return sym;
+}
+async function quoteTokenAmount(auth, token, usd2) {
+  if (token === "USDC" || token === "USDT") {
+    return { amount: usd2.toFixed(6), priceUsd: 1 };
+  }
+  const priceUsd = await getTokenUsdPrice(auth, "AMIKO");
+  if (!priceUsd || priceUsd <= 0) {
+    throw new Error("Could not fetch AMIKO/USD price from the Amiko platform. Try again in a moment, or pay with --token USDT/USDC.");
+  }
+  const amount2 = (usd2 / priceUsd * 1.01).toFixed(6);
+  return { amount: amount2, priceUsd };
+}
+async function payTreasury(auth, args) {
+  const transferData = await amikoWebFetch(auth, `/api/agents/${encodeURIComponent(auth.twinId)}/wallets/${encodeURIComponent(args.wallet)}/transfer`, {
+    method: "POST",
+    body: { to: TREASURY, amount: args.amount, token: args.token, chain: "solana" }
+  });
+  if (!transferData.txHash)
+    throw new Error("Payment sent but no tx hash returned.");
+  return transferData.txHash;
+}
+
+// src/commands/search.ts
+var SEARCH_USD = 0.01;
 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>", "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) => {
+  program2.command("search <query>").description("X Search — $0.01 per search, paid in AMIKO, USDC, or USDT").option("--raw", "Output raw JSON").option("--token <token>", "Payment token (AMIKO, USDC, USDT)", "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) => {
+    let token;
+    try {
+      token = normalizePaymentToken(opts.token);
+    } catch (e5) {
+      console.error(error(e5 instanceof Error ? e5.message : String(e5)));
+      process.exit(1);
+    }
+    let quote;
+    try {
+      quote = await quoteTokenAmount(resolveAuth(), token, SEARCH_USD);
+    } catch (e5) {
+      console.error(error(e5 instanceof Error ? e5.message : String(e5)));
+      process.exit(1);
+    }
     await requireApproval({
-      cost: `1 ${opts.token || "AMIKO"}`,
+      cost: `${quote.amount} ${token} (≈ $${SEARCH_USD.toFixed(2)})`,
       summary: `X/Twitter search: ${query.slice(0, 80)}${query.length > 80 ? "…" : ""}`,
       yes: opts.yes,
-      commandExample: `amiko markets search ${JSON.stringify(query)}${opts.token && opts.token !== "AMIKO" ? ` --token ${opts.token}` : ""}`
+      commandExample: `amiko markets search ${JSON.stringify(query)}${token !== "AMIKO" ? ` --token ${token}` : ""}`
     });
     const spinner = ora("X Search...").start();
     try {
@@ -28328,9 +28373,7 @@ function registerSearchCommand(program2) {
         process.exit(1);
       }
       const mppBase2 = (config2.apiBase || "https://mpp.amikomarkets.com").replace(/\/$/, "");
-      const token = opts.token || "AMIKO";
-      const chain = "solana";
-      const amount2 = token === "AMIKO" ? "1" : "0.01";
+      const amount2 = quote.amount;
       let wallet;
       try {
         wallet = await resolveWalletAddress(auth, opts.wallet, "solana");
@@ -28339,19 +28382,10 @@ function registerSearchCommand(program2) {
         console.error(error(e5 instanceof Error ? e5.message : String(e5)));
         process.exit(1);
       }
-      spinner.text = `Paying ${amount2} ${token} (${chain})...`;
+      spinner.text = `Paying ${amount2} ${token} (solana)...`;
       let txHash;
       try {
-        const transferData = await amikoWebFetch(auth, `/api/agents/${encodeURIComponent(auth.twinId)}/wallets/${encodeURIComponent(wallet)}/transfer`, {
-          method: "POST",
-          body: { to: TREASURY, amount: amount2, token, chain }
-        });
-        if (!transferData.txHash) {
-          spinner.stop();
-          console.error(error("Payment sent but no tx hash returned."));
-          process.exit(1);
-        }
-        txHash = transferData.txHash;
+        txHash = await payTreasury(auth, { wallet, amount: amount2, token });
       } catch (e5) {
         spinner.stop();
         console.error(error(e5 instanceof Error ? e5.message : `${token} payment failed`));
@@ -28408,7 +28442,6 @@ function registerSearchCommand(program2) {
 }
 
 // src/commands/image.ts
-var TREASURY2 = "FPiZAf3jEnNfCwfvbv46jdPfHbmSepD4Q6iHiLJDQXvb";
 var IMAGE_MARKUP = 1.3;
 var IMAGE_PRICING = {
   "gpt-image-2": { low: { sq: 0.006, lg: 0.005 }, medium: { sq: 0.053, lg: 0.041 }, high: { sq: 0.211, lg: 0.165 } },
@@ -28426,7 +28459,7 @@ function computeImageUsd(model, quality, size3, n) {
   return Number((pricing[q][tier] * clamped * IMAGE_MARKUP).toFixed(6));
 }
 function registerImageCommand(program2) {
-  program2.command("image <prompt>").alias("img").description("Generate an image — pays in AMIKO at OpenAI pass-through pricing × 1.30 (cost varies by model/quality/size)").option("--size <size>", "Image size: 1024x1024, 1024x1536, 1536x1024", "1024x1024").option("--quality <q>", "Quality: low, medium, high, auto", "high").option("--model <model>", `Model: ${SUPPORTED_MODELS.join(", ")}`, DEFAULT_IMAGE_MODEL).option("--n <count>", "Number of images (1–4)", "1").option("--background <bg>", "Background: transparent, opaque, auto").option("--format <fmt>", "Output: png, webp, jpeg", "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) => {
+  program2.command("image <prompt>").alias("img").description("Generate an image — pays in AMIKO at OpenAI pass-through pricing × 1.30 (cost varies by model/quality/size)").option("--size <size>", "Image size: 1024x1024, 1024x1536, 1536x1024", "1024x1024").option("--quality <q>", "Quality: low, medium, high, auto", "high").option("--model <model>", `Model: ${SUPPORTED_MODELS.join(", ")}`, DEFAULT_IMAGE_MODEL).option("--n <count>", "Number of images (1–4)", "1").option("--background <bg>", "Background: transparent, opaque, auto").option("--format <fmt>", "Output: png, webp, jpeg", "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("--token <token>", "Payment token (AMIKO, USDC, USDT)", "AMIKO").option("--raw", "Output raw JSON").option("--yes", "Skip the pre-spend confirmation (required in non-interactive shells)").action(async (prompt, opts) => {
     if (!SUPPORTED_MODELS.includes(opts.model)) {
       console.error(error(`Unknown model "${opts.model}". Supported: ${SUPPORTED_MODELS.join(", ")}.`));
       process.exit(1);
@@ -28461,14 +28494,23 @@ function registerImageCommand(program2) {
       console.error(error(e5 instanceof Error ? e5.message : "auth failed"));
       process.exit(1);
     }
-    const amikoUsd = await getTokenUsdPrice(auth, "AMIKO");
-    if (!amikoUsd || amikoUsd <= 0) {
-      console.error(error("Could not fetch AMIKO/USD price from the Amiko platform. Try again in a moment, or top up via `amiko credits topup` and use credit auto-pay instead."));
+    let payToken;
+    try {
+      payToken = normalizePaymentToken(opts.token);
+    } catch (e5) {
+      console.error(error(e5 instanceof Error ? e5.message : String(e5)));
+      process.exit(1);
+    }
+    let quote;
+    try {
+      quote = await quoteTokenAmount(auth, payToken, usdCost);
+    } catch (e5) {
+      console.error(error(e5 instanceof Error ? e5.message : String(e5)));
       process.exit(1);
     }
-    const amikoAmount = (usdCost / amikoUsd).toFixed(6);
+    const payAmount = quote.amount;
     await requireApproval({
-      cost: `${amikoAmount} AMIKO (≈ $${usdCost.toFixed(4)} @ $${amikoUsd.toFixed(6)}/AMIKO, ${opts.model} ${opts.quality} ${opts.size}${n > 1 ? ` ×${n}` : ""})`,
+      cost: `${payAmount} ${payToken} (≈ $${usdCost.toFixed(4)} @ $${quote.priceUsd.toFixed(6)}/${payToken}, ${opts.model} ${opts.quality} ${opts.size}${n > 1 ? ` ×${n}` : ""})`,
       summary: `Generate image: ${prompt.slice(0, 80)}${prompt.length > 80 ? "…" : ""}`,
       yes: opts.yes,
       commandExample: `amiko markets image ${JSON.stringify(prompt)}`
@@ -28512,19 +28554,10 @@ function registerImageCommand(program2) {
         console.error(error(e5 instanceof Error ? e5.message : String(e5)));
         process.exit(1);
       }
-      setStatus(`Paying ${amikoAmount} AMIKO...`);
+      setStatus(`Paying ${payAmount} ${payToken}...`);
       let txHash;
       try {
-        const transferData = await amikoWebFetch(auth, `/api/agents/${encodeURIComponent(auth.twinId)}/wallets/${encodeURIComponent(wallet)}/transfer`, {
-          method: "POST",
-          body: { to: TREASURY2, amount: amikoAmount, token: "AMIKO", chain: "solana" }
-        });
-        if (!transferData.txHash) {
-          stopProgress();
-          console.error(error("Payment sent but no tx hash returned."));
-          process.exit(1);
-        }
-        txHash = transferData.txHash;
+        txHash = await payTreasury(auth, { wallet, amount: payAmount, token: payToken });
       } catch (e5) {
         stopProgress();
         console.error(error(e5 instanceof Error ? e5.message : "Payment failed"));
@@ -28536,6 +28569,7 @@ function registerImageCommand(program2) {
         headers: {
           "Content-Type": "application/json",
           "X-Payment-Tx": txHash,
+          "X-Payment-Token": payToken,
           "X-Twin-Id": auth.twinId
         },
         body: JSON.stringify({
@@ -28578,7 +28612,7 @@ function registerImageCommand(program2) {
         }
       }
       console.log("");
-      console.log(success(`Paid ${amikoAmount} AMIKO (≈ $${usdCost.toFixed(4)})`) + dim(` tx: ${txHash.slice(0, 16)}...`));
+      console.log(success(`Paid ${payAmount} ${payToken} (≈ $${usdCost.toFixed(4)})`) + dim(` tx: ${txHash.slice(0, 16)}...`));
       await printBalanceRemaining(auth);
     } catch (err) {
       stopProgress();
@@ -28742,7 +28776,7 @@ function registerCreateCommand(create2) {
       }
     });
   });
-  create2.command("music [prompt]").description("Generate music (Create Studio)").option("--model <model>", "music_v1, music-2.6, music-cover", "music-2.6").option("--lyrics <lyrics>", "Lyrics (optional)").option("--duration <ms>", "Length in ms").option("--instrumental", "Instrumental (no vocals)").option("--token <symbol>", "Preferred charge token: AMIKO, USDC, USDT, SOL").option("--raw", "Output raw JSON").option("--yes", "Skip the pre-spend confirmation (required in non-interactive shells)").action(async (prompt, opts) => {
+  create2.command("music [prompt]").description("Generate music (Create Studio)").option("--model <model>", "music_v1, music-2.6, music-cover", "music-2.6").option("--lyrics <lyrics>", "Lyrics (optional)").option("--duration <ms>", "Length in ms").option("--instrumental", "Instrumental (no vocals)").option("--lyrics-optimizer", "Auto-write lyrics from the prompt (music_v1 only; on by default when no --lyrics/--instrumental)").option("--token <symbol>", "Preferred charge token: AMIKO, USDC, USDT, SOL").option("--raw", "Output raw JSON").option("--yes", "Skip the pre-spend confirmation (required in non-interactive shells)").action(async (prompt, opts) => {
     if (!prompt && !opts.lyrics) {
       console.error(error("Provide a prompt or --lyrics."));
       process.exit(1);
@@ -28760,6 +28794,7 @@ function registerCreateCommand(create2) {
         ...opts.lyrics ? { lyrics: opts.lyrics } : {},
         ...opts.duration ? { durationMs: Number(opts.duration) } : {},
         ...opts.instrumental ? { isInstrumental: true } : {},
+        ...opts.lyricsOptimizer ? { lyricsOptimizer: true } : {},
         ...opts.token ? { preferredToken: opts.token } : {}
       }
     });
@@ -28958,6 +28993,10 @@ function detectMime(buffer, name) {
 
 // src/commands/chat.ts
 var UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+var CUID_RE = /^c[a-z0-9]{20,}$/i;
+function looksLikeConversationId(t) {
+  return UUID_RE.test(t) || CUID_RE.test(t);
+}
 function authOrExit() {
   try {
     return requireAuth();
@@ -28989,7 +29028,7 @@ async function findOrCreateDm(auth, userId) {
 }
 async function resolveConversation(auth, target) {
   const t = target.trim();
-  if (UUID_RE.test(t))
+  if (looksLikeConversationId(t))
     return t;
   if (t.startsWith("@")) {
     const handle = t.slice(1);
@@ -29403,24 +29442,29 @@ function registerCardCommand(card) {
 }
 
 // src/commands/amazon.ts
-var TREASURY3 = "FPiZAf3jEnNfCwfvbv46jdPfHbmSepD4Q6iHiLJDQXvb";
-async function payAmiko(auth, wallet, amount2) {
-  const data = await amikoWebFetch(auth, `/api/agents/${encodeURIComponent(auth.twinId)}/wallets/${encodeURIComponent(wallet)}/transfer`, {
-    method: "POST",
-    body: { to: TREASURY3, amount: amount2, token: "AMIKO", chain: "solana" }
-  });
-  if (!data.txHash)
-    throw new Error("No tx hash returned.");
-  return data.txHash;
-}
+var AMAZON_SEARCH_USD = 0.01;
 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>", "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) => {
+  cmd.command("search <query>").description("Search Amazon products — $0.01, paid in AMIKO, USDC, or USDT").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("--token <token>", "Payment token (AMIKO, USDC, USDT)", "AMIKO").option("--raw", "Output raw JSON").option("--yes", "Skip the pre-spend confirmation (required in non-interactive shells)").action(async (query, opts) => {
+    let payToken;
+    try {
+      payToken = normalizePaymentToken(opts.token);
+    } catch (e5) {
+      console.error(error(e5 instanceof Error ? e5.message : String(e5)));
+      process.exit(1);
+    }
+    let quote;
+    try {
+      quote = await quoteTokenAmount(resolveAuth(), payToken, AMAZON_SEARCH_USD);
+    } catch (e5) {
+      console.error(error(e5 instanceof Error ? e5.message : String(e5)));
+      process.exit(1);
+    }
     await requireApproval({
-      cost: "1 AMIKO",
+      cost: `${quote.amount} ${payToken} (≈ $${AMAZON_SEARCH_USD.toFixed(2)})`,
       summary: `Amazon product search: ${query.slice(0, 80)}${query.length > 80 ? "…" : ""}`,
       yes: opts.yes,
-      commandExample: `amiko markets amazon search ${JSON.stringify(query)}`
+      commandExample: `amiko markets amazon search ${JSON.stringify(query)}${payToken !== "AMIKO" ? ` --token ${payToken}` : ""}`
     });
     const spinner = ora("Searching Amazon...").start();
     try {
@@ -29442,14 +29486,14 @@ function registerAmazonCommand(program2) {
         console.error(error(e5 instanceof Error ? e5.message : String(e5)));
         process.exit(1);
       }
-      spinner.text = "Paying 1 AMIKO...";
-      const txHash = await payAmiko(auth, wallet, "1");
+      spinner.text = `Paying ${quote.amount} ${payToken}...`;
+      const txHash = await payTreasury(auth, { wallet, amount: quote.amount, token: payToken });
       spinner.text = "Searching Amazon...";
       const params = new URLSearchParams({
         q: `site:amazon.com ${query}`
       });
       const res = await fetch(`${mppBase2}/v1/search/google_shopping?${params}`, {
-        headers: { "X-Payment-Tx": txHash, "X-Twin-Id": auth.twinId }
+        headers: { "X-Payment-Tx": txHash, "X-Payment-Token": payToken, "X-Twin-Id": auth.twinId }
       });
       spinner.stop();
       if (!res.ok) {
@@ -29546,52 +29590,52 @@ function registerAmazonCommand(program2) {
 }
 
 // src/commands/services.ts
-var TREASURY4 = "FPiZAf3jEnNfCwfvbv46jdPfHbmSepD4Q6iHiLJDQXvb";
 function usdToAmiko(usd2, pricePerAmiko) {
   if (pricePerAmiko <= 0)
     return "1";
   const amount2 = usd2 / pricePerAmiko;
   return Math.ceil(amount2 * 100) / 100 + "";
 }
-async function payAndCall(mppBase2, method, path2, auth, wallet, amountOrAuto, body, onProgress, token = "AMIKO") {
+async function payAndCall(mppBase2, method, path2, auth, wallet, amountOrAuto, body, onProgress, rawToken = "AMIKO") {
+  const token = normalizePaymentToken(rawToken);
   if (!path2.startsWith("/")) {
     throw new Error(`path must start with "/" — got: ${path2}`);
   }
   let amount2 = amountOrAuto;
   if (amount2 === "auto") {
     onProgress?.("Fetching price...");
+    let usdPrice = 0;
     try {
       const specRes = await fetchWithTimeout2(`${mppBase2}/openapi.json`, {}, 15000);
       if (specRes.ok) {
         const spec = await specRes.json();
         const pathSpec = spec.paths?.[path2];
         const methodSpec = pathSpec?.[method.toLowerCase()];
-        const usdPrice = parseFloat(methodSpec?.["x-payment-info"]?.price || "0");
-        if (usdPrice > 0) {
-          const amikoPrice = await getTokenUsdPrice(auth, "AMIKO") ?? 0;
-          amount2 = usdToAmiko(usdPrice, amikoPrice);
-          onProgress?.(`Price: $${usdPrice.toFixed(4)} = ${amount2} AMIKO`);
-        } else {
-          amount2 = "1";
-        }
-      } else {
-        amount2 = "1";
+        usdPrice = parseFloat(methodSpec?.["x-payment-info"]?.price || "0");
       }
     } catch {
+      usdPrice = 0;
+    }
+    if (token === "USDC" || token === "USDT") {
+      if (!(usdPrice > 0)) {
+        throw new Error(`Could not auto-price ${path2} in USD — pass an explicit amount (e.g. --${token.toLowerCase()} 0.01).`);
+      }
+      amount2 = usdPrice.toFixed(6);
+      onProgress?.(`Price: $${usdPrice.toFixed(4)} = ${amount2} ${token}`);
+    } else if (usdPrice > 0) {
+      const amikoPrice = await getTokenUsdPrice(auth, "AMIKO") ?? 0;
+      amount2 = usdToAmiko(usdPrice, amikoPrice);
+      onProgress?.(`Price: $${usdPrice.toFixed(4)} = ${amount2} AMIKO`);
+    } else {
       amount2 = "1";
     }
   }
   onProgress?.(`Paying ${amount2} ${token}...`);
-  const transferData = await amikoWebFetch(auth, `/api/agents/${encodeURIComponent(auth.twinId)}/wallets/${encodeURIComponent(wallet)}/transfer`, {
-    method: "POST",
-    body: { to: TREASURY4, amount: amount2, token, chain: "solana" }
-  });
-  const txHash = transferData.txHash;
-  if (!txHash)
-    throw new Error("Payment sent but no tx hash returned.");
+  const txHash = await payTreasury(auth, { wallet, amount: amount2, token });
   const headers = {
     "Content-Type": "application/json",
     "X-Payment-Tx": txHash,
+    "X-Payment-Token": token,
     "X-Twin-Id": auth.twinId
   };
   const fetchOpts = { method, headers };
@@ -29687,13 +29731,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>", "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)";
+  svc.command("call <method> <path> [body]").description("Call any MPP endpoint — pays in AMIKO, USDC, or USDT on Solana").option("--amiko <amount>", "AMIKO tokens to pay (default: auto-price from USD)").option("--usdc <amount>", 'Pay in USDC instead of AMIKO ("auto" to price from USD)').option("--usdt <amount>", 'Pay in USDT instead of AMIKO ("auto" to price from USD)').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.usdt ? `${opts.usdt} USDT` : 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 markets 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}` : ""}${opts.usdt ? ` --usdt ${opts.usdt}` : ""}`
     });
     let body;
     if (bodyStr) {
@@ -29708,8 +29752,9 @@ function registerServicesCommand(program2) {
       method: method.toUpperCase(),
       path: path2,
       body,
-      amiko: opts.amiko || (opts.usdc ? undefined : "auto"),
+      amiko: opts.amiko || (opts.usdc || opts.usdt ? undefined : "auto"),
       usdc: opts.usdc,
+      usdt: opts.usdt,
       opts
     });
   });
@@ -29760,8 +29805,8 @@ async function callService(params) {
       console.error(error(e5 instanceof Error ? e5.message : String(e5)));
       process.exit(1);
     }
-    const token = params.usdc ? "USDC" : "AMIKO";
-    const amount2 = params.usdc || params.amiko || "auto";
+    const token = params.usdt ? "USDT" : params.usdc ? "USDC" : "AMIKO";
+    const amount2 = params.usdt || params.usdc || params.amiko || "auto";
     const { res, txHash, amikoSpent } = await payAndCall(mppBase2, params.method, params.path, auth, wallet, amount2, params.body, (msg) => {
       spinner.text = msg;
     }, token);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@heyamiko/amiko-cli",
-  "version": "0.12.0-beta.7",
+  "version": "0.14.0-beta.1",
   "description": "Amiko CLI — swap tokens, manage credits, bridge cross-chain, and call marketplace agents",
   "type": "module",
   "bin": {

package/skills/SKILL.md

@@ -92,9 +92,11 @@ All paid markets commands auto-select the twin's active Solana wallet (see `--wa
 
 **Prefer `amiko create` for anything it supports.** For media generation — image, video, speech (TTS), music, SFX — use `amiko create` (async, charge-on-success, never loses money on a timeout), NOT `markets`. Reach for `markets` **only for what `create` does not cover**: X/Twitter search, Amazon, AI chat, speech-to-text/transcription, and arbitrary MPP endpoints via `markets service call`.
 
+**Payment token:** `markets search`, `markets image`, and `markets amazon search` accept `--token <AMIKO|USDC|USDT>` (default AMIKO); `markets service call` uses `--usdc`/`--usdt` (pass `auto` to price from USD). Stables are pinned at $1.00 — the amount equals the endpoint's USD price — so there is no forced swap through AMIKO. When the owner asks to pay in USDT/USDC, pass the flag; do NOT swap first.
+
 ## Create Studio — behavior notes
 
-`amiko create <image|video|tts|music|sfx>` is the CLI half of the platform Create Studio. It generates through Amiko's own authenticated endpoints (not raw MPP), runs **async**, and is **charged on success** from the twin's custodial wallet — a failed or timed-out generation is **never billed**, and there is no pre-pay. **The command returns immediately** with a `jobId` and `status: PENDING` — it does NOT block for the whole generation (so you're not held for 60s–9min). It prints how to check + a rough ETA. **Do NOT sit in a tight polling loop** (it burns turns/tokens). After submitting, **tell the user roughly how long to wait and stop** — image ~15–60s, video ~2–9min, music ~30–120s, tts/sfx ~5–20s (e.g. "your video's generating — check back in a few minutes"). Then retrieve it **once** later — when the user next asks, or after the ETA — with `amiko create status <jobId>` (re-query that job, ~24h) or `amiko create media` (list recent generations; `--service`/`--limit`/`--raw`). Result is a permanent Supabase Storage URL. **Do NOT use `--wait`** — there's no such option; `create` is always non-blocking, so submit then check later with `amiko create status <jobId>`. `--token <AMIKO|USDC|USDT|SOL>` selects the charge token (default auto, AMIKO-first). Prefer `create` over `markets image` for media generation — it doesn't lose money on timeouts. `markets image` remains the raw MPP pre-pay path.
+`amiko create <image|video|tts|music|sfx>` is the CLI half of the platform Create Studio. It generates through Amiko's own authenticated endpoints (not raw MPP), runs **async**, and is **charged on success** from the twin's custodial wallet — a failed or timed-out generation is **never billed**, and there is no pre-pay. **The command returns immediately** with a `jobId` and `status: PENDING` — it does NOT block for the whole generation (so you're not held for 60s–9min). It prints how to check + a rough ETA. **Do NOT sit in a tight polling loop** (it burns turns/tokens). After submitting, **tell the user roughly how long to wait and stop** — image ~15–60s, video ~2–9min, music ~30–120s, tts/sfx ~5–20s (e.g. "your video's generating — check back in a few minutes"). Then retrieve it **once** later — when the user next asks, or after the ETA — with `amiko create status <jobId>` (re-query that job, ~24h) or `amiko create media` (list recent generations; `--service`/`--limit`/`--raw`). Result is a permanent Supabase Storage URL. **Do NOT use `--wait`** — there's no such option; `create` is always non-blocking, so submit then check later with `amiko create status <jobId>`. `--token <AMIKO|USDC|USDT|SOL>` selects the charge token (default auto, AMIKO-first). Prefer `create` over `markets image` for media generation — it doesn't lose money on timeouts. `markets image` remains the raw MPP pre-pay path. For **music**, a plain prompt is enough — `create music "a triumphant orchestral ballad"` sings from the prompt (lyrics auto-written); add `--lyrics "…"` to set exact words, or `--instrumental` for no vocals. Don't paste long lyrics into the prompt itself.
 
 ## Chat — behavior notes