@agent-score/commerce 1.2.0 → 1.3.1

package/dist/challenge/index.mjs

@@ -23,14 +23,15 @@ function buildAcceptedMethods(input) {
       pay_to: input.x402_base.recipient
     });
   }
-  if (input.x402_solana) {
+  if (input.solana_mpp) {
     out.push({
-      method: "x402/exact",
-      network: input.x402_solana.network ?? "solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp",
-      token: input.x402_solana.token ?? "EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v",
-      symbol: input.x402_solana.symbol ?? "USDC",
-      decimals: input.x402_solana.decimals ?? 6,
-      pay_to: input.x402_solana.recipient
+      method: "solana/charge",
+      network: input.solana_mpp.network ?? "solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp",
+      token: input.solana_mpp.token ?? "EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v",
+      symbol: input.solana_mpp.symbol ?? "USDC",
+      decimals: input.solana_mpp.decimals ?? 6,
+      pay_to: input.solana_mpp.recipient,
+      ...input.solana_mpp.feePayerKey ? { fee_payer_key: input.solana_mpp.feePayerKey } : {}
     });
   }
   if (input.stripe) {
@@ -90,7 +91,7 @@ function buildHowToPay(input) {
       prerequisite: `Run \`tempo wallet whoami\` and confirm USDC.e balance on ${networkName} (chain ${chainId}) is at least $${maxSpend}. If the tempo CLI is not installed, run the setup commands above first.`,
       command: recommend === "agentscore-pay" ? payCommand : tempoCommand,
       ...recommend === "both" ? { alternative_command: payCommand } : recommend === "agentscore-pay" ? { alternative_command: tempoCommand } : {},
-      what_it_does: `Hits this endpoint, receives this same 402, signs the MPP challenge on ${networkName}, and submits the credential back via Authorization: Payment. Either client (tempo request or agentscore-pay pay --chain tempo) works \u2014 both run the full MPP handshake.`
+      what_it_does: `Pays via Tempo USDC on ${networkName}.`
     };
   }
   if (input.rails.x402_base) {
@@ -99,16 +100,16 @@ function buildHowToPay(input) {
       setup: PAY_SETUP_BASE,
       prerequisite: `Run \`agentscore-pay balance --chain base\` and confirm USDC balance on Base (${network}) is at least $${maxSpend}. If the CLI is not installed, run the setup commands above first.`,
       command: `agentscore-pay pay POST ${input.url} --chain base -H 'X-Operator-Token: ${opToken}' -H 'Content-Type: application/json' -d '${input.retryBodyJson}' --max-spend ${maxSpend}`,
-      what_it_does: "Hits this endpoint, receives this same 402, signs an EIP-3009 USDC TransferWithAuthorization on Base, submits via X-Payment header. Server verifies + settles via the Coinbase facilitator + returns 200 with the completed order."
+      what_it_does: "Pays via USDC on Base."
     };
   }
-  if (input.rails.x402_solana) {
-    const network = input.rails.x402_solana.network ?? "solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp";
-    block.x402_solana = {
+  if (input.rails.solana_mpp) {
+    const network = input.rails.solana_mpp.network ?? "solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp";
+    block.solana_mpp = {
       setup: PAY_SETUP_SOLANA,
       prerequisite: `Run \`agentscore-pay balance --chain solana\` and confirm USDC balance on Solana (${network}) is at least $${maxSpend}. If the CLI is not installed, run the setup commands above first.`,
       command: `agentscore-pay pay POST ${input.url} --chain solana -H 'X-Operator-Token: ${opToken}' -H 'Content-Type: application/json' -d '${input.retryBodyJson}' --max-spend ${maxSpend}`,
-      what_it_does: "Hits this endpoint, receives this same 402, signs an SPL Token TransferChecked transaction on Solana, submits via X-Payment header. Server verifies + settles via the Coinbase facilitator + returns 200 with the completed order."
+      what_it_does: "Pays via USDC on Solana."
     };
   }
   if (input.rails.stripe) {
@@ -131,7 +132,7 @@ function buildHowToPay(input) {
         `SPEND_ID=$(link-cli spend-request create --payment-method-id <csmrpd_id_from_payment_methods_list> --credential-type shared_payment_token --network-id ${stripeCfg.profileId} --amount ${amountCents} --context "${sptContext}" --request-approval --output-json | jq -r .id)`,
         `link-cli mpp pay ${input.url} --spend-request-id $SPEND_ID --method POST --data '${input.retryBodyJson}' --header 'X-Operator-Token: ${opToken}' --output-json`
       ];
-      stripe.what_it_does_link_cli = "For users who have a Stripe Link wallet: step 1 mints a one-time-use SharedPaymentToken scoped to this purchase and pushes a notification to the user for approval (blocks until approved); step 2 submits the SPT via the MPP handshake along with your AgentScore operator credential.";
+      stripe.what_it_does_link_cli = "Mints a one-time-use SharedPaymentToken scoped to this purchase (user approves in Link wallet), then submits it as the payment credential.";
     } else if (linkCliBlocked) {
       stripe.note = `link-cli SPT path not available for this purchase \u2014 Stripe link-cli caps spend requests at $500.00 ($50000 cents); your total is $${totalNum}. Use your own Stripe account with the SharedPaymentToken API instead.`;
     }
@@ -141,27 +142,27 @@ function buildHowToPay(input) {
 }
 
 // src/challenge/agent_instructions.ts
-var TEMPO_WARNING = "Do NOT use `tempo wallet transfer` to pay to the address above. That moves USDC on-chain but does not notify this server, leaving your order in pending_identity state. Use `tempo request` instead \u2014 it performs the full MPP handshake (signs, submits Authorization: Payment, waits for server confirmation).";
-var X402_WARNING = "Do NOT send USDC manually to the x402 deposit addresses (e.g. via a bare wallet `transfer`). Use `agentscore-pay pay` so the X-Payment credential is signed and submitted; otherwise the order stays in pending_identity even though the deposit lands.";
-var TEMPO_TOOL = "`tempo request` for Tempo USDC (installs via `tempo add request`)";
-var AGENTSCORE_PAY_TOOL = "`agentscore-pay` (npm: `@agent-score/pay`) \u2014 single CLI for x402 on Base + Solana, also speaks tempo MPP via `--chain tempo`";
-var DEFAULT_WALLET_COMPATIBILITY = "No specific wallet stack required. The 402 challenge is rail-neutral: any client that can produce a valid MPP credential (Authorization: Payment) or x402 X-Payment header is accepted. The CLI commands above are the easiest path; sign-it-yourself is fine too.";
+var TEMPO_WARNING = "Do NOT use `tempo wallet transfer`. That moves USDC on-chain without completing the protocol handshake, so the order will not complete. Use `tempo request` instead.";
+var X402_WARNING = "Do NOT send USDC manually to the deposit addresses. Use `agentscore-pay pay` so the credential is signed and submitted; otherwise the order will not complete even though the deposit lands.";
+var TEMPO_TOOL = "`tempo request` for Tempo USDC";
+var AGENTSCORE_PAY_TOOL = "`agentscore-pay` \u2014 Base + Solana + Tempo from one CLI";
+var DEFAULT_WALLET_COMPATIBILITY = "Any client that can produce a valid MPP credential (Authorization: Payment) or x402 X-Payment header. Use the CLI commands above; sign-it-yourself is also fine.";
 function defaultRecommendedTools(howToPay) {
   const tools = [];
   if (howToPay.tempo) tools.push(TEMPO_TOOL);
-  if (howToPay.tempo || howToPay.x402_base || howToPay.x402_solana) tools.push(AGENTSCORE_PAY_TOOL);
+  if (howToPay.tempo || howToPay.x402_base || howToPay.solana_mpp) tools.push(AGENTSCORE_PAY_TOOL);
   return tools;
 }
 function defaultWarnings(howToPay) {
   const w = [];
   if (howToPay.tempo) w.push(TEMPO_WARNING);
-  if (howToPay.x402_base || howToPay.x402_solana) w.push(X402_WARNING);
+  if (howToPay.x402_base) w.push(X402_WARNING);
   return w;
 }
 var RAIL_CLIENTS = {
   tempo_mpp: ["agentscore-pay", "tempo request", "x402-proxy"],
   x402_base: ["agentscore-pay", "x402-proxy", "purl (omit --network flag)"],
-  x402_solana: ["agentscore-pay"],
+  solana_mpp: ["agentscore-pay"],
   stripe: ["link-cli"]
 };
 function compatibleClientsByRails(rails) {
@@ -173,7 +174,7 @@ function defaultCompatibleClients(howToPay) {
   const rails = [];
   if (howToPay.tempo) rails.push("tempo_mpp");
   if (howToPay.x402_base) rails.push("x402_base");
-  if (howToPay.x402_solana) rails.push("x402_solana");
+  if (howToPay.solana_mpp) rails.push("solana_mpp");
   if (howToPay.stripe) rails.push("stripe");
   return compatibleClientsByRails(rails);
 }
@@ -184,7 +185,7 @@ function buildAgentInstructions(input) {
     recommended_tools: input.recommendedTools ?? defaultRecommendedTools(input.howToPay),
     wallet_compatibility: input.walletCompatibility ?? DEFAULT_WALLET_COMPATIBILITY,
     timeout_seconds: input.timeoutSeconds ?? 300,
-    warnings: input.warnings ?? defaultWarnings(input.howToPay),
+    warnings: input.warnings ?? [...defaultWarnings(input.howToPay), ...input.extraWarnings ?? []],
     ...input.recommended ? { recommended: input.recommended } : {},
     ...compatibleClients ? { compatible_clients: compatibleClients } : {},
     ...input.extra ?? {}