@elisym/mcp 0.8.2 → 0.8.4

package/dist/index.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { LIMITS, DEFAULT_KIND_OFFSET, SolanaPaymentStrategy, makeCensor, DEFAULT_REDACT_PATHS, validateAgentName, RELAYS, toDTag, formatAssetAmount, USDC_SOLANA_DEVNET, estimateSolFeeLamports, formatFeeBreakdown, resolveAssetFromPaymentRequest as resolveAssetFromPaymentRequest$1, parseAssetAmount, ElisymIdentity, ElisymClient, NATIVE_SOL, getProtocolProgramId, getProtocolConfig, assetKey, assetByKey, resolveKnownAsset, KNOWN_ASSETS } from '@elisym/sdk';
+import { LIMITS, DEFAULT_KIND_OFFSET, SolanaPaymentStrategy, makeCensor, DEFAULT_REDACT_PATHS, validateAgentName, RELAYS, toDTag, formatAssetAmount, USDC_SOLANA_DEVNET, estimateSolFeeLamports, formatFeeBreakdown, resolveAssetFromPaymentRequest as resolveAssetFromPaymentRequest$1, parseAssetAmount, ElisymIdentity, ElisymClient, NATIVE_SOL, resolveKnownAsset, getProtocolProgramId, getProtocolConfig, assetKey, assetByKey, KNOWN_ASSETS } from '@elisym/sdk';
 import { listAgents, createAgentDir, writeYaml, writeSecrets, loadAgent, globalConfigPath } from '@elisym/sdk/agent-store';
 import { loadGlobalConfig, writeGlobalConfig } from '@elisym/sdk/node';
 import { getBase58Encoder, getBase58Decoder, generateKeyPairSigner, address, createSolanaRpcSubscriptions, sendAndConfirmTransactionFactory, getSignatureFromTransaction, pipe, createTransactionMessage, setTransactionMessageFeePayerSigner, setTransactionMessageLifetimeUsingBlockhash, appendTransactionMessageInstructions, signTransactionMessageWithSigners, createKeyPairSignerFromBytes, createSolanaRpc, isAddress } from '@solana/kit';
@@ -289,10 +289,24 @@ function formatSolNumeric(lamports) {
   const frac = abs % LAMPORTS_PER_SOL;
   return `${sign}${whole}.${frac.toString().padStart(9, "0")}`;
 }
-function formatSolShort(lamports) {
-  const whole = lamports / LAMPORTS_PER_SOL;
-  const frac = lamports % LAMPORTS_PER_SOL / 100000n;
-  return `${whole}.${frac.toString().padStart(4, "0")} SOL`;
+function assetFromCardPayment(payment2) {
+  if (!payment2) {
+    return NATIVE_SOL;
+  }
+  const known = resolveKnownAsset(payment2.chain, payment2.token ?? "sol", payment2.mint);
+  if (known) {
+    return known;
+  }
+  if (payment2.token && payment2.symbol && typeof payment2.decimals === "number") {
+    return {
+      chain: payment2.chain,
+      token: payment2.token,
+      mint: payment2.mint,
+      symbol: payment2.symbol,
+      decimals: payment2.decimals
+    };
+  }
+  return NATIVE_SOL;
 }
 function parseSolToLamports(s) {
   const trimmed = s.trim();
@@ -1290,10 +1304,17 @@ function makePaymentFeedbackHandler(opts) {
       );
       return;
     }
+    let asset;
+    try {
+      asset = resolveAssetFromPaymentRequest(parsedRequest);
+    } catch (e) {
+      opts.rejectPayment(e instanceof Error ? e : new Error(String(e)));
+      return;
+    }
     if (opts.maxPriceLamports === void 0 && signedAmount !== void 0) {
       opts.rejectPayment(
         new Error(
-          `Payment of ${formatSol(BigInt(signedAmount))} required but no max_price_lamports set. Retry with max_price_lamports to approve.`
+          `Payment of ${formatAssetAmount(asset, BigInt(signedAmount))} required but no max_price_lamports set. Retry with max_price_lamports to approve.`
         )
       );
       return;
@@ -1301,7 +1322,7 @@ function makePaymentFeedbackHandler(opts) {
     if (opts.maxPriceLamports !== void 0 && signedAmount !== void 0 && signedAmount > opts.maxPriceLamports) {
       opts.rejectPayment(
         new Error(
-          `Price ${formatSol(BigInt(signedAmount))} exceeds max ${formatSol(BigInt(opts.maxPriceLamports))}`
+          `Price ${formatAssetAmount(asset, BigInt(signedAmount))} exceeds max ${formatAssetAmount(asset, BigInt(opts.maxPriceLamports))}`
         )
       );
       return;
@@ -1309,12 +1330,11 @@ function makePaymentFeedbackHandler(opts) {
     if (!opts.agent.solanaKeypair) {
       opts.resolveNoWallet(
         `Payment required but no Solana wallet configured.
-Amount: ${signedAmount !== void 0 ? formatSol(BigInt(signedAmount)) : "unknown"}
+Amount: ${signedAmount !== void 0 ? formatAssetAmount(asset, BigInt(signedAmount)) : "unknown"}
 Payment request: ${paymentRequest}`
       );
       return;
     }
-    const asset = resolveAssetFromPaymentRequest(parsedRequest);
     let reservedAmount;
     if (signedAmount !== void 0) {
       try {
@@ -1683,9 +1703,10 @@ ${result}`);
         );
       }
       const price = card.payment?.job_price ?? 0;
+      const cardAsset = assetFromCardPayment(card.payment);
       if (input.max_price_lamports !== void 0 && price > input.max_price_lamports) {
         return errorResult(
-          `Price ${formatSolShort(BigInt(price))} exceeds max ${formatSolShort(BigInt(input.max_price_lamports))}`
+          `Price ${formatAssetAmount(cardAsset, BigInt(price))} exceeds max ${formatAssetAmount(cardAsset, BigInt(input.max_price_lamports))}`
         );
       }
       if (price > 0 && input.max_price_lamports === void 0) {
@@ -1693,7 +1714,7 @@ ${result}`);
           content: [
             {
               type: "text",
-              text: `Capability "${input.capability}" from "${provider.name || input.provider_npub}" costs ${formatSolShort(BigInt(price))}.
+              text: `Capability "${input.capability}" from "${provider.name || input.provider_npub}" costs ${formatAssetAmount(cardAsset, BigInt(price))}.
 
 To confirm, call buy_capability again with max_price_lamports set (e.g. ${price} or higher).`
             }
@@ -1795,11 +1816,13 @@ var dashboardTools = [
       );
       const rows = filtered.map((a) => {
         const mainCard = a.cards[0];
+        const mainAsset = assetFromCardPayment(mainCard?.payment);
+        const mainPrice = mainCard?.payment?.job_price;
         return {
           name: sanitizeField(a.name || mainCard?.name || "unknown", 30),
           npub: a.npub,
           capabilities: (mainCard?.capabilities ?? []).join(", "),
-          price: mainCard?.payment?.job_price ? formatSolShort(BigInt(mainCard.payment.job_price)) : "free",
+          price: mainPrice ? formatAssetAmount(mainAsset, BigInt(mainPrice)) : "free",
           cards_count: a.cards.length
         };
       }).slice(0, input.top_n);
@@ -2023,15 +2046,22 @@ var discoveryTools = [
       const results = filtered.map((a) => ({
         npub: a.npub,
         name: sanitizeField(a.name || "", 200),
-        cards: a.cards.map((c) => ({
-          name: sanitizeField(c.name || "", 200),
-          description: sanitizeField(c.description || "", 500),
-          capabilities: c.capabilities,
-          job_price_lamports: c.payment?.job_price,
-          price_display: c.payment?.job_price ? formatSolShort(BigInt(c.payment.job_price)) : "free",
-          chain: c.payment?.chain,
-          network: c.payment?.network
-        })),
+        cards: a.cards.map((card) => {
+          const asset = assetFromCardPayment(card.payment);
+          const price = card.payment?.job_price;
+          return {
+            name: sanitizeField(card.name || "", 200),
+            description: sanitizeField(card.description || "", 500),
+            capabilities: card.capabilities,
+            job_price_subunits: price,
+            price_display: price ? formatAssetAmount(asset, BigInt(price)) : "free",
+            asset_token: asset.token,
+            asset_symbol: asset.symbol,
+            asset_mint: asset.mint,
+            chain: card.payment?.chain,
+            network: card.payment?.network
+          };
+        }),
         supported_kinds: a.supportedKinds
       }));
       const { text } = sanitizeUntrusted(JSON.stringify(results, null, 2), "structured");