@elisym/cli 0.26.1 → 0.27.0

package/dist/index.js

@@ -2,8 +2,8 @@
 import { ReadableStream } from 'node:stream/web';
 import { readFileSync, existsSync, readdirSync, statSync, renameSync, chmodSync, mkdirSync, writeFileSync, appendFileSync, unlinkSync, rmdirSync, realpathSync } from 'node:fs';
 import { dirname, join, resolve, basename, extname, relative, sep } from 'node:path';
-import { SolanaPaymentStrategy, validateAgentName, RELAYS, ElisymIdentity, formatSol, formatAssetAmount, USDC_SOLANA_DEVNET, signerFromSecretKeyBase58, ElisymClient, KIND_EXTERNAL_IDENTITIES, POLICY_D_TAG_PREFIX, KIND_LONG_FORM_ARTICLE, jobRequestKind, DEFAULT_KIND_OFFSET, toDTag, DEFAULTS, createBlossomTransport, generateSolanaWallet, verifyAgentIdentities, getProtocolConfig, getProtocolProgramId, calculateProtocolFee, LIMITS, makeCensor, DEFAULT_REDACT_PATHS, POLICY_T_TAG, SESSION_ID_REGEX, createSlidingWindowLimiter, utf8ByteLength, readAcceptedTransports, resolveDelegationAsset, MAX_PROOF_TTL_SECS, PROOF_CLOCK_SKEW_SECS, verifyDelegationAuthProof, deriveOwnerDelegationAta, getDelegation, buildDelegatedTransfer, buildSignedPull, sendConfirmToTerminal, parseDelegatedPayment, confirmPullToTerminal, isDefinitelyUnpaid, decodeJobPayload, BoundedSet, KIND_JOB_FEEDBACK, encodeSecretKeyBase58, GITHUB_USERNAME_REGEX, X_USERNAME_REGEX, normalizeNip05Identifier, splitNip05Identifier, NATIVE_SOL, GIST_ID_REGEX, TWEET_ID_REGEX } from '@elisym/sdk';
-import { ElisymYamlSchema, resolveInHome, resolveInProject, createAgentDir, writeYamlInitial, writeExampleSkillTemplate, writeSecrets, listAgents, loadAgent, writeYaml, agentPaths, readMediaCache, loadPoliciesFromDir, ensureGitignoreHasIrohEntry, ensureGitignoreHasX402Entries, ensureGitignoreHasSessionsEntry, ensureGitignoreHasDelegationNoncesEntry, lookupCachedUrl, newCacheEntry, writeMediaCache } from '@elisym/sdk/agent-store';
+import { SolanaPaymentStrategy, validateAgentName, RELAYS, ElisymIdentity, splAssetsForNetwork, formatSol, formatAssetAmount, signerFromSecretKeyBase58, resolveUsdcAsset, ElisymClient, KIND_EXTERNAL_IDENTITIES, POLICY_D_TAG_PREFIX, KIND_LONG_FORM_ARTICLE, jobRequestKind, DEFAULT_KIND_OFFSET, toDTag, DEFAULTS, createBlossomTransport, generateSolanaWallet, verifyAgentIdentities, getProtocolConfig, getProtocolProgramId, calculateProtocolFee, LIMITS, makeCensor, DEFAULT_REDACT_PATHS, POLICY_T_TAG, SESSION_ID_REGEX, createSlidingWindowLimiter, utf8ByteLength, readAcceptedTransports, resolveDelegationAsset, MAX_PROOF_TTL_SECS, PROOF_CLOCK_SKEW_SECS, verifyDelegationAuthProof, deriveOwnerDelegationAta, getDelegation, buildDelegatedTransfer, buildSignedPull, sendConfirmToTerminal, parseDelegatedPayment, confirmPullToTerminal, isDefinitelyUnpaid, decodeJobPayload, BoundedSet, KIND_JOB_FEEDBACK, encodeSecretKeyBase58, GITHUB_USERNAME_REGEX, X_USERNAME_REGEX, normalizeNip05Identifier, splitNip05Identifier, NATIVE_SOL, GIST_ID_REGEX, TWEET_ID_REGEX } from '@elisym/sdk';
+import { ElisymYamlSchema, resolveInHome, resolveInProject, createAgentDir, writeYamlInitial, writeExampleSkillTemplate, writeSecrets, listAgents, loadAgent, writeYaml, agentPaths, readMediaCache, loadPoliciesFromDir, ensureGitignoreHasIrohEntry, ensureGitignoreHasX402Entries, ensureGitignoreHasSessionsEntry, ensureGitignoreHasDelegationNoncesEntry, readAgentPublic, lookupCachedUrl, newCacheEntry, writeMediaCache } from '@elisym/sdk/agent-store';
 import { isAddress, createSolanaRpc, address, signature } from '@solana/kit';
 import { generateSecretKey, getPublicKey, nip19, verifyEvent } from 'nostr-tools';
 import YAML2 from 'yaml';
@@ -1064,8 +1064,18 @@ var init_llm = __esm({
 var init_exports = {};
 __export(init_exports, {
   cmdInit: () => cmdInit,
-  fetchModels: () => fetchModels3
+  fetchModels: () => fetchModels3,
+  parseNetworkOption: () => parseNetworkOption
 });
+function parseNetworkOption(raw) {
+  if (raw === void 0) {
+    return void 0;
+  }
+  if (raw === "devnet" || raw === "mainnet") {
+    return raw;
+  }
+  throw new Error(`--network must be "devnet" or "mainnet"; got "${raw}"`);
+}
 function buildDefaultYaml() {
   return ElisymYamlSchema.parse({
     description: "An elisym AI agent",
@@ -1097,6 +1107,7 @@ async function cmdInit(nameArg, options = {}) {
   if (options.config && options.defaults) {
     throw new Error("--config and --defaults are mutually exclusive; pick one.");
   }
+  const networkFlag = parseNetworkOption(options.network);
   const skipConfirms = options.yes || options.defaults;
   let template;
   if (options.config) {
@@ -1105,9 +1116,20 @@ async function cmdInit(nameArg, options = {}) {
     template = ElisymYamlSchema.parse(YAML2.parse(raw) ?? {});
     console.log(`  Loaded template from ${configPath}
 `);
+    const templateSolana = template.payments.find((entry) => entry.chain === "solana");
+    if (networkFlag !== void 0 && templateSolana && templateSolana.network !== networkFlag) {
+      throw new Error(
+        `--network ${networkFlag} conflicts with the template's payments[].network (${templateSolana.network}). Edit the template or drop the flag.`
+      );
+    }
   } else if (options.defaults) {
     template = buildDefaultYaml();
     console.log("  Using default skeleton (no LLM, no payments). Edit later via `profile`.\n");
+    if (networkFlag !== void 0) {
+      console.warn(
+        "  ! --network has no effect with --defaults (no payments entry is created). The wallet network is chosen when you configure a wallet.\n"
+      );
+    }
   }
   const agentName = await resolveAgentName2(nameArg, inquirer);
   const target = pickTarget(options);
@@ -1166,7 +1188,7 @@ async function cmdInit(nameArg, options = {}) {
   if (template) {
     yaml = template;
   } else {
-    const result = await promptYaml(inquirer);
+    const result = await promptYaml(inquirer, networkFlag);
     yaml = result.yaml;
     promptedApiKey = result.apiKey;
   }
@@ -1259,6 +1281,14 @@ async function cmdInit(nameArg, options = {}) {
       ]);
     }
   }
+  const mainnetBound = yaml.payments.some(
+    (entry) => entry.chain === "solana" && entry.network === "mainnet"
+  );
+  if (mainnetBound && !passphrase) {
+    console.warn(
+      "  ! No passphrase set: this MAINNET agent will store its secrets unencrypted on disk.\n    Strongly consider one (--passphrase or ELISYM_PASSPHRASE) - its keys will guard real funds."
+    );
+  }
   const nostrSecretBytes = generateSecretKey();
   const nostrPubkey = getPublicKey(nostrSecretBytes);
   const nostrSecretHex = Buffer.from(nostrSecretBytes).toString("hex");
@@ -1284,7 +1314,7 @@ async function cmdInit(nameArg, options = {}) {
   console.log(`  Location: ${created.dir}`);
   console.log(`  Nostr:    ${npub}`);
   if (yaml.payments[0]?.address) {
-    console.log(`  Solana:   ${yaml.payments[0].address}`);
+    console.log(`  Solana:   ${yaml.payments[0].address} (${yaml.payments[0].network})`);
   }
   if (passphrase) {
     console.log("  Secrets encrypted with your passphrase.");
@@ -1314,7 +1344,7 @@ async function resolveAgentName2(nameArg, inquirer) {
   validateAgentName(inputName);
   return inputName;
 }
-async function promptYaml(inquirer) {
+async function promptYaml(inquirer, networkFlag) {
   const { description } = await inquirer.prompt([
     {
       type: "input",
@@ -1361,10 +1391,34 @@ async function promptYaml(inquirer) {
       }
     }
   ]);
+  let walletNetwork = "devnet";
   if (solanaAddress) {
-    console.log(
-      "  The wallet receives every asset on Solana (SOL directly, USDC and other\n  SPL tokens via their ATA). Each skill declares its own price and token\n  in SKILL.md. Fund with SOL via `solana airdrop` or USDC via https://faucet.circle.com."
-    );
+    if (networkFlag !== void 0) {
+      walletNetwork = networkFlag;
+    } else {
+      const { network } = await inquirer.prompt([
+        {
+          type: "list",
+          name: "network",
+          message: "Solana network (fixed at init - to go mainnet later, create a new agent):",
+          choices: [
+            { name: "devnet (test tokens - recommended to start)", value: "devnet" },
+            { name: "mainnet (REAL funds)", value: "mainnet" }
+          ],
+          default: "devnet"
+        }
+      ]);
+      walletNetwork = network;
+    }
+    if (walletNetwork === "mainnet") {
+      console.log(
+        "  ! MAINNET: this wallet handles REAL funds - every skill price is real money\n    and there is no faucet. Fund it with real SOL (and USDC if skills price in it).\n    The network is fixed at init: to go back to devnet, create a new agent."
+      );
+    } else {
+      console.log(
+        "  The wallet receives every asset on Solana (SOL directly, USDC and other\n  SPL tokens via their ATA). Each skill declares its own price and token\n  in SKILL.md. Fund with SOL via `solana airdrop` or USDC via https://faucet.circle.com."
+      );
+    }
   }
   const { llmProvider } = await inquirer.prompt([
     {
@@ -1389,7 +1443,7 @@ async function promptYaml(inquirer) {
     picture: picture || void 0,
     banner: banner || void 0,
     relays: [...RELAYS],
-    payments: solanaAddress ? [{ chain: "solana", network: "devnet", address: solanaAddress }] : [],
+    payments: solanaAddress ? [{ chain: "solana", network: walletNetwork, address: solanaAddress }] : [],
     security: {}
   };
   if (llmProvider === "none") {
@@ -1450,15 +1504,24 @@ var WATCHDOG_PROBE_TIMEOUT_MS = 1e4;
 var WATCHDOG_SELF_PING_INTERVAL_MS = 10 * 60 * 1e3;
 var WATCHDOG_SELF_PING_TIMEOUT_MS = 15e3;
 var WATCHDOG_SLEEP_DETECT_MULTIPLIER = 2;
-function getRpcUrl(_network) {
+function getRpcUrl(network) {
   const envUrl = process.env.SOLANA_RPC_URL;
   if (envUrl) {
     return envUrl;
   }
-  return "https://api.devnet.solana.com";
+  return network === "mainnet" ? "https://api.mainnet-beta.solana.com" : "https://api.devnet.solana.com";
 }
-async function fetchUsdcBalance(rpc, owner) {
-  const mint = USDC_SOLANA_DEVNET.mint;
+async function solanaLineFor(agent) {
+  try {
+    const { yaml } = await readAgentPublic(agent);
+    const solana = yaml.payments.find((entry) => entry.chain === "solana");
+    return solana ? ` | Solana: ${solana.address} (${solana.network})` : "";
+  } catch {
+    return "";
+  }
+}
+async function fetchSplBalance(rpc, owner, asset) {
+  const mint = asset.mint;
   if (!mint) {
     return 0n;
   }
@@ -1472,21 +1535,39 @@ async function fetchUsdcBalance(rpc, owner) {
     for (const entry of response.value) {
       const parsed = entry.account.data;
       const raw = parsed?.parsed?.info?.tokenAmount?.amount;
-      if (typeof raw === "string") {
-        total += BigInt(raw);
+      if (typeof raw !== "string") {
+        return null;
       }
+      total += BigInt(raw);
     }
     return total;
   } catch {
-    return 0n;
+    return null;
   }
 }
+function formatSplBalanceValue(asset, balance) {
+  return balance === void 0 || balance === null ? "unavailable (balance read failed)" : formatAssetAmount(asset, balance);
+}
+async function fetchUsdcBalance(rpc, owner, network) {
+  return fetchSplBalance(rpc, owner, resolveUsdcAsset(network));
+}
 
 // src/x402/constants.ts
 var X402_SOLANA_DEVNET_CAIP2 = "solana:EtWTRABZaYq6iMfeYKouRu166VU2xqa1";
 var X402_SOLANA_DEVNET_V1 = "solana-devnet";
+var X402_SOLANA_MAINNET_CAIP2 = "solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp";
+var X402_SOLANA_MAINNET_V1 = "solana";
+function x402SolanaNetworkIds(network) {
+  return network === "mainnet" ? { caip2: X402_SOLANA_MAINNET_CAIP2, v1: X402_SOLANA_MAINNET_V1 } : { caip2: X402_SOLANA_DEVNET_CAIP2, v1: X402_SOLANA_DEVNET_V1 };
+}
 var X402_GET_INPUT_MAX_ENCODED_BYTES = 2048;
 var X402_MAX_RESPONSE_BYTES = 10 * 1024 * 1024;
+var X402_ERROR_EXCERPT_CHARS = 400;
+var X402_MAX_ERROR_BODY_BYTES = 8 * 1024;
+var X402_ERROR_BODY_READ_MS = 5e3;
+var X402_MAX_ERROR_BODY_READS = 2048;
+var X402_MAX_CHALLENGE_HEADER_CHARS = 64 * 1024;
+var X402_MASKED_INPUT_MIN_CHARS = 8;
 var X402_MAX_CHALLENGE_BYTES = 256 * 1024;
 var X402_PROBE_TTL_MS = 3e4;
 var X402_MAX_PAID_ATTEMPTS = 2;
@@ -1494,8 +1575,6 @@ var X402_MAX_PAYMENT_SIGNATURES = 2 * X402_MAX_PAID_ATTEMPTS;
 var X402_FREE_RETRY_DELAYS_MS = [1e3, 3e3];
 var X402_REFUNDED_RETRIES = 1;
 var X402_CACHE_TTL_MS = 7 * 24 * 60 * 60 * 1e3;
-
-// src/x402/matcher.ts
 function requirementAmount(requirement) {
   const v1Amount = requirement.maxAmountRequired;
   const raw = requirement.amount ?? v1Amount;
@@ -1509,10 +1588,12 @@ function isAcceptableRequirement(requirement, rule) {
     return false;
   }
   const network = requirement.network;
-  if (network !== X402_SOLANA_DEVNET_CAIP2 && network !== X402_SOLANA_DEVNET_V1) {
+  const acceptedIds = x402SolanaNetworkIds(rule.network);
+  if (network !== acceptedIds.caip2 && network !== acceptedIds.v1) {
     return false;
   }
-  if (USDC_SOLANA_DEVNET.mint === void 0 || requirement.asset !== USDC_SOLANA_DEVNET.mint) {
+  const usdcMint = resolveUsdcAsset(rule.network).mint;
+  if (usdcMint === void 0 || requirement.asset !== usdcMint) {
     return false;
   }
   const amount = requirementAmount(requirement);
@@ -1697,7 +1778,6 @@ async function probePaymentRequiredCached(url, method, ttlMs) {
 // src/commands/x402-add.ts
 var BPS_DENOMINATOR = 1e4;
 var DEFAULT_MARGIN_BPS = 1e3;
-var SOLANA_MAINNET_CAIP2 = "solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp";
 var CIRCLE_FAUCET_URL = "https://faucet.circle.com";
 function fail(message) {
   console.error(`
@@ -1782,7 +1862,7 @@ function buildSkillMd(input) {
     "Operator notes for this x402 bridge skill (the executor ignores this body):",
     "",
     `- Upstream: ${input.url} (${input.method})`,
-    `- Upstream quote at generation time: ${formatAssetAmount(USDC_SOLANA_DEVNET, input.quote)} (= x402_max_upstream, the signing ceiling)`,
+    `- Upstream quote at generation time: ${formatAssetAmount(resolveUsdcAsset(input.network), input.quote)} (= x402_max_upstream, the signing ceiling)`,
     `- Price: ${input.priceDisplay} USDC (margin ${input.marginPercent}%, protocol fee ${input.feePercent}% at generation time)`,
     "- To reprice after an upstream change, re-run:",
     "",
@@ -1834,15 +1914,17 @@ function scanExistingSkills(skillsDir, candidateDTag, url) {
   }
   return scan;
 }
-function describeUnacceptableAccepts(probe) {
+function describeUnacceptableAccepts(probe, agentNetwork) {
   const networks = [...new Set(probe.accepts.map((requirement) => String(requirement.network)))];
   if (networks.length > 0 && networks.every((network) => network.startsWith("eip155:"))) {
     return `the service accepts only EVM networks (${networks.join(", ")}) - not supported yet`;
   }
-  if (networks.some((network) => network === SOLANA_MAINNET_CAIP2 || network === "solana")) {
-    return "the service settles on Solana mainnet - elisym currently runs on devnet (mainnet is on the roadmap)";
+  const otherNetwork = agentNetwork === "mainnet" ? "devnet" : "mainnet";
+  const otherIds = x402SolanaNetworkIds(otherNetwork);
+  if (networks.some((network) => network === otherIds.caip2 || network === otherIds.v1)) {
+    return `the service settles on Solana ${otherNetwork} but this agent is bound to ${agentNetwork} (one agent = one network) - bridge it from a ${otherNetwork} agent instead` + (otherNetwork === "mainnet" ? " (create one: npx @elisym/cli init --network mainnet)" : "");
   }
-  return `no exact-scheme devnet-USDC requirement found (service accepts: ${networks.join(", ") || "nothing parseable"})`;
+  return `no exact-scheme ${agentNetwork}-USDC requirement found (service accepts: ${networks.join(", ") || "nothing parseable"})`;
 }
 async function cmdX402Add(url, agentName, options) {
   const cwd = process.cwd();
@@ -1886,6 +1968,33 @@ async function cmdX402Add(url, agentName, options) {
   }
   const passphrase = process.env.ELISYM_PASSPHRASE;
   const loaded = await loadAgent(agentName, cwd, passphrase);
+  const existingSolPayment = loaded.yaml.payments.find((entry) => entry.chain === "solana");
+  let agentNetwork;
+  if (existingSolPayment !== void 0) {
+    agentNetwork = existingSolPayment.network;
+  } else if (options.yes) {
+    agentNetwork = "devnet";
+  } else {
+    const { network } = await inquirer.prompt([
+      {
+        type: "list",
+        name: "network",
+        message: "This agent has no Solana wallet entry yet. Which network should it operate on (fixed once set)?",
+        choices: [
+          { name: "devnet (test tokens - recommended to start)", value: "devnet" },
+          { name: "mainnet (REAL funds)", value: "mainnet" }
+        ],
+        default: "devnet"
+      }
+    ]);
+    agentNetwork = network;
+    if (agentNetwork === "mainnet") {
+      console.log(
+        "  ! MAINNET: the bridge float and its upstream payments are REAL funds.\n    The network is fixed once written - to switch, create a new agent."
+      );
+    }
+  }
+  const usdcAsset = resolveUsdcAsset(agentNetwork);
   console.log(`
   Probing ${url} (${method}, unpaid)...`);
   let probe;
@@ -1898,10 +2007,13 @@ async function cmdX402Add(url, agentName, options) {
     const message = error instanceof Error ? error.message : String(error);
     fail(`upstream unreachable: ${message}`);
   }
-  const anyCeiling = { maxUpstreamSubunits: BigInt(Number.MAX_SAFE_INTEGER) };
+  const anyCeiling = {
+    maxUpstreamSubunits: BigInt(Number.MAX_SAFE_INTEGER),
+    network: agentNetwork
+  };
   const requirement = selectAcceptableRequirement(probe.accepts, anyCeiling);
   if (requirement === void 0) {
-    fail(describeUnacceptableAccepts(probe));
+    fail(describeUnacceptableAccepts(probe, agentNetwork));
   }
   const quote = requirementAmount(requirement);
   if (quote === null || quote <= 0n) {
@@ -1963,6 +2075,11 @@ async function cmdX402Add(url, agentName, options) {
         );
       }
     }
+    if (agentNetwork === "mainnet" && !passphrase) {
+      console.warn(
+        "  ! No passphrase set: this MAINNET wallet key will be stored unencrypted on disk.\n    Strongly consider one (ELISYM_PASSPHRASE) - the key will guard real funds."
+      );
+    }
     await writeSecrets(
       loaded.dir,
       { ...loaded.secrets, solana_secret_key: solanaSecretKey },
@@ -1971,33 +2088,35 @@ async function cmdX402Add(url, agentName, options) {
     console.log("  Wallet key saved to .secrets.json");
   }
   const signer = await signerFromSecretKeyBase58(solanaSecretKey);
-  const solPayment = loaded.yaml.payments.find((entry) => entry.chain === "solana");
-  if (solPayment !== void 0 && solPayment.address !== signer.address) {
+  if (existingSolPayment !== void 0 && existingSolPayment.address !== signer.address) {
     fail(
-      `wallet invariant violated: elisym.yaml payments[].address (${solPayment.address}) differs from the solana_secret_key address (${signer.address}).
+      `wallet invariant violated: elisym.yaml payments[].address (${existingSolPayment.address}) differs from the solana_secret_key address (${signer.address}).
     Revenue must land in the wallet the bridge spends from, or the float never refills.
     Fix: set payments[].address to the key address, or import the matching key.`
     );
   }
-  if (solPayment === void 0) {
+  if (existingSolPayment === void 0) {
     console.log(
-      `  elisym.yaml has no Solana payments entry; adding address ${signer.address} (devnet).`
+      `  elisym.yaml has no Solana payments entry; adding address ${signer.address} (${agentNetwork}).`
     );
     await writeYaml(loaded.dir, {
       ...loaded.yaml,
       payments: [
         ...loaded.yaml.payments,
-        { chain: "solana", network: "devnet", address: signer.address }
+        { chain: "solana", network: agentNetwork, address: signer.address }
       ]
     });
   }
-  const rpc = createSolanaRpc(getRpcUrl());
-  const balance = await fetchUsdcBalance(rpc, address(signer.address));
+  const rpc = createSolanaRpc(getRpcUrl(agentNetwork));
+  const balance = await fetchUsdcBalance(rpc, address(signer.address), agentNetwork);
   let feeBps;
   try {
-    const protocolConfig = await getProtocolConfig(rpc, getProtocolProgramId("devnet"), {
-      forceRefresh: true
-    });
+    const protocolConfig = await getProtocolConfig(
+      rpc,
+      getProtocolProgramId(agentNetwork),
+      agentNetwork,
+      { forceRefresh: true }
+    );
     feeBps = protocolConfig.feeBps;
   } catch (error) {
     const message = error instanceof Error ? error.message : String(error);
@@ -2009,7 +2128,7 @@ async function cmdX402Add(url, agentName, options) {
     );
   }
   const priceSubunits = computeBridgePriceSubunits(quote, marginBps, feeBps);
-  const priceDisplay = new Decimal(priceSubunits.toString()).div(new Decimal(10).pow(USDC_SOLANA_DEVNET.decimals)).toString();
+  const priceDisplay = new Decimal(priceSubunits.toString()).div(new Decimal(10).pow(usdcAsset.decimals)).toString();
   const protocolFee = calculateProtocolFee(Number(priceSubunits), feeBps);
   const netMargin = priceSubunits - BigInt(protocolFee) - quote;
   const fallbackName = slugFromUrl(parsedUrl);
@@ -2078,18 +2197,17 @@ async function cmdX402Add(url, agentName, options) {
   console.log(
     `  Upstream     ${url} (${method}${queryParam !== void 0 ? `, input in ?${queryParam}=` : ""}${noInput ? ", no buyer input" : ""})`
   );
-  console.log(`  Quote        ${formatAssetAmount(USDC_SOLANA_DEVNET, quote)}`);
-  console.log(
-    `  Your price   ${formatAssetAmount(USDC_SOLANA_DEVNET, priceSubunits)}  (margin ${marginPercent}% + protocol fee ${feePercent}%)`
-  );
-  console.log(`  Net margin   ${formatAssetAmount(USDC_SOLANA_DEVNET, netMargin)} per job`);
+  console.log(`  Network      ${agentNetwork}`);
+  console.log(`  Quote        ${formatAssetAmount(usdcAsset, quote)}`);
   console.log(
-    `  Float        ${formatAssetAmount(USDC_SOLANA_DEVNET, balance)} in ${signer.address}`
+    `  Your price   ${formatAssetAmount(usdcAsset, priceSubunits)}  (margin ${marginPercent}% + protocol fee ${feePercent}%)`
   );
-  if (balance < quote) {
+  console.log(`  Net margin   ${formatAssetAmount(usdcAsset, netMargin)} per job`);
+  console.log(`  Float        ${formatSplBalanceValue(usdcAsset, balance)} in ${signer.address}`);
+  if (balance !== null && balance < quote) {
     console.log(
       chalk.yellow(
-        `  ! Float below one upstream quote - fund the wallet with devnet USDC: ${CIRCLE_FAUCET_URL}`
+        agentNetwork === "mainnet" ? "  ! Float below one upstream quote - fund the wallet with USDC (mainnet, REAL funds)" : `  ! Float below one upstream quote - fund the wallet with devnet USDC: ${CIRCLE_FAUCET_URL}`
       )
     );
   }
@@ -2113,10 +2231,12 @@ async function cmdX402Add(url, agentName, options) {
     queryParam,
     quote,
     marginPercent,
-    feePercent
+    feePercent,
+    network: agentNetwork
   });
   const roundTrip = parseSkillMd(content);
   validateSkillFrontmatter(roundTrip.frontmatter, roundTrip.systemPrompt, {
+    network: agentNetwork,
     allowFreeSkills: false,
     allowX402Skills: true
   });
@@ -2125,8 +2245,10 @@ async function cmdX402Add(url, agentName, options) {
   await ensureGitignoreHasX402Entries(dirname(loaded.dir));
   console.log(`
   Wrote ${join(targetDir, "SKILL.md")}`);
-  if (balance < quote) {
-    console.log(`  Next: fund the float (devnet USDC): ${CIRCLE_FAUCET_URL}`);
+  if (balance !== null && balance < quote) {
+    console.log(
+      agentNetwork === "mainnet" ? "  Next: fund the float with USDC on mainnet (REAL funds)." : `  Next: fund the float (devnet USDC): ${CIRCLE_FAUCET_URL}`
+    );
   }
   console.log(`  Start the agent: npx @elisym/cli start ${agentName}
 `);
@@ -2162,7 +2284,7 @@ async function resolveAgentName(name, cwd, nonInteractive) {
 }
 async function printDelegateStatus(delegateSecretKey, network) {
   const signer = await signerFromSecretKeyBase58(delegateSecretKey);
-  const rpc = createSolanaRpc(getRpcUrl());
+  const rpc = createSolanaRpc(getRpcUrl(network));
   let gasLine = "";
   try {
     const { value: balance } = await rpc.getBalance(address(signer.address)).send();
@@ -2186,7 +2308,7 @@ async function cmdDelegateKey(name, options) {
   const agentName = await resolveAgentName(name, cwd, options.yes === true);
   const passphrase = process.env.ELISYM_PASSPHRASE;
   const loaded = await loadAgent(agentName, cwd, passphrase);
-  loaded.yaml.payments.find((entry) => entry.chain === "solana")?.network ?? "devnet";
+  const network = loaded.yaml.payments.find((entry) => entry.chain === "solana")?.network ?? "devnet";
   const existing = loaded.secrets.solana_delegate_secret_key;
   if (options.show) {
     if (!existing) {
@@ -2195,12 +2317,12 @@ async function cmdDelegateKey(name, options) {
       );
       process.exit(1);
     }
-    await printDelegateStatus(existing);
+    await printDelegateStatus(existing, network);
     return;
   }
   if (existing && !options.rotate) {
     console.log(`  Agent "${agentName}" already has a delegate key.`);
-    await printDelegateStatus(existing);
+    await printDelegateStatus(existing, network);
     console.log("  Use --rotate to replace it (this invalidates outstanding owner approvals).");
     return;
   }
@@ -2257,6 +2379,11 @@ async function cmdDelegateKey(name, options) {
       process.exit(1);
     }
   }
+  if (network === "mainnet" && !passphrase) {
+    console.warn(
+      "  ! No passphrase set: this MAINNET delegate key will be stored unencrypted on disk.\n    Strongly consider one (ELISYM_PASSPHRASE) - the key spends owner-approved real funds."
+    );
+  }
   await writeSecrets(
     loaded.dir,
     { ...loaded.secrets, solana_delegate_secret_key: delegateSecretKey },
@@ -2265,7 +2392,7 @@ async function cmdDelegateKey(name, options) {
   console.log(
     existing ? "\n  Delegate key rotated and saved." : "\n  Delegate key generated and saved."
   );
-  await printDelegateStatus(delegateSecretKey);
+  await printDelegateStatus(delegateSecretKey, network);
 }
 var IDENTITY_PLATFORMS = ["github", "x", "website"];
 var X_PROOF_URL_HOSTS = /* @__PURE__ */ new Set([
@@ -2899,12 +3026,12 @@ async function cmdProfile(name) {
       console.log("  Profile updated.\n");
     }
     if (section === "wallet") {
-      const current = loaded.yaml.payments[0];
+      const current = loaded.yaml.payments.find((entry) => entry.chain === "solana");
       const answers = await inquirer.prompt([
         {
           type: "input",
           name: "address",
-          message: "Solana address (empty to clear):",
+          message: current ? "Solana address:" : "Solana address (empty to skip):",
           default: current?.address ?? "",
           validate: (value) => {
             if (!value) {
@@ -2914,9 +3041,40 @@ async function cmdProfile(name) {
           }
         }
       ]);
+      if (!answers.address && current) {
+        console.log(
+          "  ! The wallet entry cannot be removed: it pins the agent network, which is\n    fixed at creation - to change networks, create a new agent. To stop\n    charging, set every skill price to 0 instead. Wallet unchanged.\n"
+        );
+        continue;
+      }
+      let walletNetwork = current?.network;
+      if (answers.address && walletNetwork === void 0) {
+        const { network } = await inquirer.prompt([
+          {
+            type: "list",
+            name: "network",
+            message: "Solana network (fixed once set - to switch later, create a new agent):",
+            choices: [
+              { name: "devnet (test tokens - recommended to start)", value: "devnet" },
+              { name: "mainnet (REAL funds)", value: "mainnet" }
+            ],
+            default: "devnet"
+          }
+        ]);
+        walletNetwork = network;
+        if (walletNetwork === "mainnet") {
+          console.log(
+            "  ! MAINNET: this wallet handles REAL funds - every skill price is real money\n    and there is no faucet. Strongly consider encrypting secrets with a passphrase."
+          );
+        }
+      }
+      const otherChainEntries = loaded.yaml.payments.filter((entry) => entry.chain !== "solana");
       const nextYaml = {
         ...loaded.yaml,
-        payments: answers.address ? [{ chain: "solana", network: "devnet", address: answers.address }] : []
+        payments: answers.address && walletNetwork !== void 0 ? [
+          ...otherChainEntries,
+          { chain: "solana", network: walletNetwork, address: answers.address }
+        ] : otherChainEntries
       };
       await writeYaml(loaded.dir, nextYaml);
       loaded.yaml = nextYaml;
@@ -4748,14 +4906,11 @@ var AgentRuntime = class {
   }
   /** Fetch on-chain protocol config (fee, treasury). Always fetches fresh to avoid stale treasury. */
   async fetchProtocolConfig() {
-    if (this.config.network !== "devnet") {
-      throw new Error(
-        `Network "${this.config.network}" is not supported. Only "devnet" is available until the on-chain protocol program is deployed on mainnet.`
-      );
-    }
-    const programId = getProtocolProgramId("devnet");
+    const programId = getProtocolProgramId(this.config.network);
     const rpc = createSolanaRpc(getRpcUrl(this.config.network));
-    const config = await getProtocolConfig(rpc, programId, { forceRefresh: true });
+    const config = await getProtocolConfig(rpc, programId, this.config.network, {
+      forceRefresh: true
+    });
     return { feeBps: config.feeBps, treasury: config.treasury };
   }
   async run() {
@@ -5243,12 +5398,6 @@ var AgentRuntime = class {
         "this agent does not accept delegated payment."
       );
     }
-    if (this.config.network !== "devnet") {
-      return reject(
-        `delegation is devnet-only (network: ${this.config.network})`,
-        "this agent does not accept delegated payment."
-      );
-    }
     const network = this.config.network;
     if (!skill || skill.delegation === void 0 || skill.priceSubunits <= 0) {
       return reject(
@@ -5365,7 +5514,9 @@ var AgentRuntime = class {
       // first delegated job does not dead-letter on a missing ATA.
       ensureDestination: { owner: this.config.solanaAddress }
     });
-    const pull = await buildSignedPull(ctx.rpc, ctx.delegateSigner, instructions);
+    const pull = await buildSignedPull(ctx.rpc, ctx.delegateSigner, instructions, {
+      network: ctx.network
+    });
     this.ledger.recordPullSignature(
       job.jobId,
       pull.signature,
@@ -5840,6 +5991,7 @@ var AgentRuntime = class {
       this.config.solanaAddress,
       jobPrice,
       protocolConfig,
+      this.config.network,
       { expirySecs: this.config.paymentTimeoutSecs, asset: jobAsset }
     );
     const requestJson = JSON.stringify(request);
@@ -6804,7 +6956,7 @@ function buildCliSkill(parsed, entryPath, scriptEnv) {
   }
   return skill;
 }
-function loadSkillsFromDir(skillsDir, options = {}) {
+function loadSkillsFromDir(skillsDir, options) {
   const skills = [];
   let entries;
   try {
@@ -6826,10 +6978,16 @@ function loadSkillsFromDir(skillsDir, options = {}) {
       const content = readFileSync(skillMdPath, "utf-8");
       const { frontmatter, systemPrompt } = parseSkillMd(content);
       const parsed = validateSkillFrontmatter(frontmatter, systemPrompt, {
+        network: options.network,
         allowFreeSkills: true,
         // The CLI runtime wires an x402 driver into the skill context, so
         // x402 skills are executable here (SDK-only hosts reject them).
-        allowX402Skills: true
+        allowX402Skills: true,
+        // Surface SDK load-time warnings (e.g. the devnet lsm->SOL pricing
+        // fallback) in the start flow's ` !` console pattern.
+        logger: {
+          warn: (_obj, msg) => console.warn(`  ! ${msg ?? ""}`)
+        }
       });
       skills.push(buildCliSkill(parsed, entryPath, options.scriptEnv));
     } catch (e) {
@@ -7368,6 +7526,15 @@ function isTextContentType(contentType) {
   const mime = contentType.split(";")[0]?.trim().toLowerCase() ?? "";
   return mime.startsWith("text/") || mime === "application/json" || mime.endsWith("+json");
 }
+function concatChunks(chunks, total) {
+  const combined = new Uint8Array(total);
+  let offset = 0;
+  for (const chunk of chunks) {
+    combined.set(chunk, offset);
+    offset += chunk.byteLength;
+  }
+  return combined;
+}
 async function readBodyCapped(response, maxBytes) {
   const reader = response.body?.getReader();
   if (reader === void 0) {
@@ -7392,13 +7559,43 @@ async function readBodyCapped(response, maxBytes) {
     }
     chunks.push(value);
   }
-  const combined = new Uint8Array(total);
-  let offset = 0;
-  for (const chunk of chunks) {
-    combined.set(chunk, offset);
-    offset += chunk.byteLength;
+  return concatChunks(chunks, total);
+}
+async function readBodyPrefix(response, maxBytes, timeoutMs) {
+  const reader = response.body?.getReader();
+  if (reader === void 0) {
+    return { text: "", truncated: false };
   }
-  return combined;
+  const chunks = [];
+  let total = 0;
+  let ended = false;
+  let timedOut = false;
+  const deadline = setTimeout(() => {
+    timedOut = true;
+    reader.cancel().catch(() => {
+    });
+  }, timeoutMs);
+  try {
+    for (let reads = 0; reads < X402_MAX_ERROR_BODY_READS && total < maxBytes; reads += 1) {
+      const { done, value } = await reader.read();
+      if (done) {
+        ended = true;
+        break;
+      }
+      const fitting = value.subarray(0, maxBytes - total);
+      total += fitting.byteLength;
+      chunks.push(fitting);
+    }
+  } catch {
+  } finally {
+    clearTimeout(deadline);
+  }
+  reader.cancel().catch(() => {
+  });
+  return {
+    text: new TextDecoder().decode(concatChunks(chunks, total)),
+    truncated: !ended || timedOut
+  };
 }
 async function capChallengeResponse(response) {
   if (response.status !== 402) {
@@ -7411,6 +7608,105 @@ async function capChallengeResponse(response) {
     headers: response.headers
   });
 }
+var PAYMENT_IDENTIFIER_EXTENSION = "payment-identifier";
+function asRecord(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value) ? value : null;
+}
+function extensionInfo(declaration) {
+  if (declaration === null) {
+    return {};
+  }
+  return Object.hasOwn(declaration, "info") ? asRecord(declaration.info) ?? {} : declaration;
+}
+function requiredPaymentIdentifier(response) {
+  const header = response.headers.get("payment-required");
+  if (header === null || header.length > X402_MAX_CHALLENGE_HEADER_CHARS) {
+    return null;
+  }
+  try {
+    const decoded = JSON.parse(Buffer.from(header, "base64").toString("utf8"));
+    const extensions = asRecord(asRecord(decoded)?.extensions);
+    const declaration = asRecord(extensions?.[PAYMENT_IDENTIFIER_EXTENSION]);
+    return extensionInfo(declaration).required === true ? declaration : null;
+  } catch {
+    return null;
+  }
+}
+function withPaymentIdentifier(headerValue, declaration, jobId) {
+  try {
+    const record = asRecord(JSON.parse(Buffer.from(headerValue, "base64").toString("utf8")));
+    if (record === null) {
+      return headerValue;
+    }
+    const transaction = asRecord(record.payload)?.transaction;
+    const signed = typeof transaction === "string" ? transaction : headerValue;
+    const digest = createHash("sha256").update(`${jobId}:${signed}`).digest("hex");
+    const id = `pay_${digest.slice(0, 32)}`;
+    const extensions = asRecord(record.extensions) ?? {};
+    const echoed = asRecord(extensions[PAYMENT_IDENTIFIER_EXTENSION]) ?? {};
+    const info = { id, ...extensionInfo(declaration), ...extensionInfo(echoed) };
+    record.extensions = {
+      ...extensions,
+      // Mirror the shape the server declared. Its echo VALIDATOR would accept
+      // either (`@x402/core` normalizes both sides through `getExtensionInfo`
+      // first), but whatever reads the id back out afterwards is the server's
+      // own code, and the one place it can be counted on to look is where it
+      // declared the extension.
+      [PAYMENT_IDENTIFIER_EXTENSION]: Object.hasOwn(declaration, "info") ? { ...echoed, info } : info
+    };
+    return Buffer.from(JSON.stringify(record), "utf8").toString("base64");
+  } catch {
+    return headerValue;
+  }
+}
+var UNICODE_FORMAT_MARKS = /\p{Cf}/gu;
+function flattenForOperator(text) {
+  return sanitizeForTerminal(text).replace(UNICODE_FORMAT_MARKS, "").replace(/\s+/g, " ").trim();
+}
+function printedPrefix(flattened) {
+  return flattened.length <= X402_ERROR_EXCERPT_CHARS ? flattened : flattened.slice(0, X402_ERROR_EXCERPT_CHARS).replace(/[\ud800-\udbff]$/, "");
+}
+function clipForOperator(flattened) {
+  return flattened.length <= X402_ERROR_EXCERPT_CHARS ? flattened : `${printedPrefix(flattened)}...`;
+}
+function quoteUpstream(text) {
+  return clipForOperator(flattenForOperator(text));
+}
+function quoteUpstreamWithInput(text, sentInput) {
+  return clipForOperator(maskCustomerInput(flattenForOperator(text), inputForms(sentInput)));
+}
+function wireForm(sentInput) {
+  return new TextDecoder().decode(new TextEncoder().encode(sentInput));
+}
+function jsonEscapedForm(sentInput) {
+  return JSON.stringify(sentInput).slice(1, -1);
+}
+function urlEncodedForms(sentInput) {
+  const forms = [new URLSearchParams({ q: sentInput }).toString().slice("q=".length)];
+  try {
+    forms.push(encodeURIComponent(sentInput));
+  } catch {
+  }
+  return forms;
+}
+function endsInsideInput(text, forms) {
+  const tail = text.replace(/\ufffd+$/, "").slice(-X402_MASKED_INPUT_MIN_CHARS);
+  return tail.length >= X402_MASKED_INPUT_MIN_CHARS && forms.some((form) => form.includes(tail));
+}
+function inputForms(sentInput) {
+  return [wireForm(sentInput), jsonEscapedForm(sentInput), ...urlEncodedForms(sentInput)].map(
+    flattenForOperator
+  );
+}
+function maskCustomerInput(text, forms) {
+  let masked = text;
+  for (const form of forms) {
+    if (form.length >= X402_MASKED_INPUT_MIN_CHARS) {
+      masked = masked.replaceAll(form, "[input]");
+    }
+  }
+  return masked;
+}
 function abortableDelay(ms, signal) {
   return new Promise((resolve4) => {
     if (signal?.aborted) {
@@ -7433,15 +7729,17 @@ var X402Driver = class {
     this.options = options;
     this.store = new X402JobStore(options.agentDir);
     this.rpc = createSolanaRpc(options.rpcUrl);
+    this.usdcAsset = resolveUsdcAsset(options.network);
     this.store.sweepExpired().catch(() => {
     });
   }
   store;
   rpc;
+  usdcAsset;
   signerPromise = null;
   repriceHintLogged = /* @__PURE__ */ new Set();
   log(message) {
-    (this.options.log ?? console.log)(`[x402] ${message}`);
+    (this.options.log ?? console.log)(`[x402] ${flattenForOperator(message)}`);
   }
   getSigner() {
     const secret = this.options.solanaSecretKeyBase58;
@@ -7498,13 +7796,16 @@ var X402Driver = class {
       return;
     }
     const signer = await this.assertWalletInvariant();
-    if (job.asset.mint !== USDC_SOLANA_DEVNET.mint || USDC_SOLANA_DEVNET.mint === void 0) {
+    if (job.asset.mint !== this.usdcAsset.mint || this.usdcAsset.mint === void 0) {
       throw new X402PreflightError(
-        `x402 skills must be priced in devnet USDC (skill "${job.skillName}" is priced in ${job.asset.symbol}); the margin check compares the elisym price to the upstream USDC quote - re-run \`npx @elisym/cli x402 add\``
+        `x402 skills must be priced in ${this.options.network} USDC (skill "${job.skillName}" is priced in ${job.asset.symbol}); the margin check compares the elisym price to the upstream USDC quote - re-run \`npx @elisym/cli x402 add\``
       );
     }
     this.assertInputRules(job, input);
-    const rule = { maxUpstreamSubunits: job.params.maxUpstreamSubunits };
+    const rule = {
+      maxUpstreamSubunits: job.params.maxUpstreamSubunits,
+      network: this.options.network
+    };
     let probe;
     try {
       probe = await probePaymentRequiredCached(
@@ -7514,10 +7815,10 @@ var X402Driver = class {
       );
     } catch (error) {
       if (error instanceof X402ProbeError) {
-        throw new X402PreflightError(`upstream probe failed: ${error.message}`);
+        throw new X402PreflightError(`upstream probe failed: ${quoteUpstream(error.message)}`);
       }
       const message = error instanceof Error ? error.message : String(error);
-      throw new X402PreflightError(`upstream unreachable: ${message}`);
+      throw new X402PreflightError(`upstream unreachable: ${quoteUpstream(message)}`);
     }
     const quote = maxAcceptableQuote(probe.accepts, rule);
     if (quote === null) {
@@ -7528,13 +7829,18 @@ var X402Driver = class {
     if (quote < job.params.maxUpstreamSubunits && !this.repriceHintLogged.has(job.skillName)) {
       this.repriceHintLogged.add(job.skillName);
       this.log(
-        `upstream for "${job.skillName}" now quotes ${formatAssetAmount(USDC_SOLANA_DEVNET, quote)} (your price was computed from ${formatAssetAmount(USDC_SOLANA_DEVNET, job.params.maxUpstreamSubunits)}); re-run \`npx @elisym/cli x402 add\` to reprice`
+        `upstream for "${job.skillName}" now quotes ${formatAssetAmount(this.usdcAsset, quote)} (your price was computed from ${formatAssetAmount(this.usdcAsset, job.params.maxUpstreamSubunits)}); re-run \`npx @elisym/cli x402 add\` to reprice`
+      );
+    }
+    const balance = await fetchUsdcBalance(this.rpc, address(signer.address), this.options.network);
+    if (balance === null) {
+      throw new X402PreflightError(
+        `could not read the bridge float balance for ${signer.address} - refusing to pay the upstream without verifying it; retry in a moment`
       );
     }
-    const balance = await fetchUsdcBalance(this.rpc, address(signer.address));
     if (balance < quote) {
       throw new X402PreflightError(
-        `bridge float insufficient: ${formatAssetAmount(USDC_SOLANA_DEVNET, balance)} USDC in ${signer.address}, upstream quotes ${formatAssetAmount(USDC_SOLANA_DEVNET, quote)} - top up the wallet`
+        `bridge float insufficient: ${formatAssetAmount(this.usdcAsset, balance)} USDC in ${signer.address}, upstream quotes ${formatAssetAmount(this.usdcAsset, quote)} - top up the wallet`
       );
     }
     const feeBps = await this.options.getFeeBps();
@@ -7542,7 +7848,7 @@ var X402Driver = class {
     const net = BigInt(job.priceSubunits - fee);
     if (net < quote) {
       throw new X402PreflightError(
-        `negative margin: net revenue ${formatAssetAmount(USDC_SOLANA_DEVNET, net)} (price minus ${feeBps} bps protocol fee) is below the upstream quote ${formatAssetAmount(USDC_SOLANA_DEVNET, quote)} - re-run \`npx @elisym/cli x402 add\` to reprice`
+        `negative margin: net revenue ${formatAssetAmount(this.usdcAsset, net)} (price minus ${feeBps} bps protocol fee) is below the upstream quote ${formatAssetAmount(this.usdcAsset, quote)} - re-run \`npx @elisym/cli x402 add\` to reprice`
       );
     }
   }
@@ -7558,6 +7864,7 @@ var X402Driver = class {
    */
   buildInstrumentedFetch(jobId, attemptState) {
     const store = this.store;
+    let requiredIdentifier = null;
     return async function instrumentedFetch(info, init) {
       const request = new Request(info, init);
       if (request.headers.has("PAYMENT-SIGNATURE") || request.headers.has("X-PAYMENT")) {
@@ -7572,19 +7879,30 @@ var X402Driver = class {
           );
         }
         attemptState.paymentSent = true;
+        const signature = request.headers.get("PAYMENT-SIGNATURE");
+        if (requiredIdentifier !== null && signature !== null) {
+          request.headers.set(
+            "PAYMENT-SIGNATURE",
+            withPaymentIdentifier(signature, requiredIdentifier, jobId)
+          );
+        }
       }
       const response = await globalThis.fetch(new Request(request, { redirect: "error" }));
+      if (response.status === 402) {
+        requiredIdentifier = requiredPaymentIdentifier(response);
+      }
       return capChallengeResponse(response);
     };
   }
   buildClient(signer, rule) {
     const scheme = new ExactSvmScheme(signer, { rpcUrl: this.options.rpcUrl });
+    const networkIds = x402SolanaNetworkIds(this.options.network);
     return x402Client.fromConfig({
-      schemes: [{ network: X402_SOLANA_DEVNET_CAIP2, client: scheme }],
+      schemes: [{ network: networkIds.caip2, client: scheme }],
       policies: [buildRequirementsPolicy(rule)]
-    }).registerV1(X402_SOLANA_DEVNET_V1, scheme);
+    }).registerV1(networkIds.v1, scheme);
   }
-  classifyWrapperError(error) {
+  classifyWrapperError(error, sentInput) {
     if (error instanceof Error && error.name === "AbortError") {
       return error;
     }
@@ -7592,21 +7910,63 @@ var X402Driver = class {
       return error;
     }
     const message = error instanceof Error ? error.message : String(error);
+    const quoted = quoteUpstreamWithInput(message, sentInput);
     if (message.includes("Failed to create payment payload")) {
       return new X402PermanentError(
-        `payment refused by policy (upstream likely repriced above x402_max_upstream): ${message}`
+        `payment refused by policy (upstream likely repriced above x402_max_upstream): ${quoted}`
       );
     }
-    return new X402TransientError(`upstream request failed: ${message}`);
+    return new X402TransientError(`upstream request failed: ${quoted}`);
   }
-  classifyStatus(status) {
+  /**
+   * Read a short, safe excerpt of a failing upstream's body.
+   *
+   * A bare status code is not a diagnosis: a 4xx from an x402 upstream can
+   * mean a rejected payload, a missing required extension, or an argument the
+   * service did not like, and the operator cannot tell which without the
+   * body's own words. The body is untrusted, so only a bounded prefix is read
+   * at all, and it is stripped of anything that could forge a log line before
+   * it reaches the operator's. Reading it never fails the caller - an
+   * unreadable body simply yields no excerpt, which is exactly the
+   * status-only message as before.
+   *
+   * `sentInput` is the customer's own job input, masked out of the quote by
+   * `maskCustomerInput`: an upstream that echoes the request back would
+   * otherwise put it in the operator's log, which the runtime keeps it out of
+   * everywhere else.
+   */
+  async errorExcerpt(response, sentInput) {
+    try {
+      const body = await readBodyPrefix(
+        response,
+        X402_MAX_ERROR_BODY_BYTES,
+        this.options.errorBodyReadMs ?? X402_ERROR_BODY_READ_MS
+      );
+      const forms = inputForms(sentInput);
+      const quoted = maskCustomerInput(flattenForOperator(body.text), forms);
+      if (quoted.length === 0) {
+        return "";
+      }
+      const shown = printedPrefix(quoted);
+      if (body.truncated && endsInsideInput(shown, forms)) {
+        return "";
+      }
+      return `: ${clipForOperator(quoted)}`;
+    } catch {
+      return "";
+    }
+  }
+  classifyStatus(status, excerpt) {
     if (status === 402) {
-      return new X402TransientError("upstream still returned 402 after a payment attempt", status);
+      return new X402TransientError(
+        `upstream still returned 402 after a payment attempt${excerpt}`,
+        status
+      );
     }
     if (status === 429 || status >= 500) {
-      return new X402TransientError(`upstream returned ${status}`, status);
+      return new X402TransientError(`upstream returned ${status}${excerpt}`, status);
     }
-    return new X402PermanentError(`upstream returned ${status}`);
+    return new X402PermanentError(`upstream returned ${status}${excerpt}`);
   }
   async execute(job, input, signal) {
     const cached = await this.store.getResult(input.jobId);
@@ -7637,7 +7997,10 @@ var X402Driver = class {
       headers["content-type"] = jsonContentType(input.data) ? "application/json" : "text/plain";
     }
     const signer = await this.assertWalletInvariant();
-    const rule = { maxUpstreamSubunits: job.params.maxUpstreamSubunits };
+    const rule = {
+      maxUpstreamSubunits: job.params.maxUpstreamSubunits,
+      network: this.options.network
+    };
     const client = this.buildClient(signer, rule);
     const jobTag = input.jobId.slice(0, 8);
     let freeRetriesUsed = 0;
@@ -7650,7 +8013,7 @@ var X402Driver = class {
           requestUrl,
           headers,
           body,
-          input.jobId,
+          input,
           client,
           attemptState,
           signal
@@ -7698,9 +8061,9 @@ var X402Driver = class {
     }
   }
   /** One full payment-wrapper pass against the upstream; throws classified errors. */
-  async attemptUpstream(job, requestUrl, headers, body, jobId, client, attemptState, signal) {
+  async attemptUpstream(job, requestUrl, headers, body, input, client, attemptState, signal) {
     const fetchWithPayment = wrapFetchWithPayment(
-      this.buildInstrumentedFetch(jobId, attemptState),
+      this.buildInstrumentedFetch(input.jobId, attemptState),
       client
     );
     let response;
@@ -7712,27 +8075,25 @@ var X402Driver = class {
         signal
       });
     } catch (error) {
-      throw this.classifyWrapperError(error);
+      throw this.classifyWrapperError(error, input.data);
     }
     if (!response.ok) {
-      await response.body?.cancel().catch(() => {
-      });
-      throw this.classifyStatus(response.status);
+      throw this.classifyStatus(response.status, await this.errorExcerpt(response, input.data));
     }
     let bytes;
     try {
       bytes = await readBodyCapped(response, X402_MAX_RESPONSE_BYTES);
     } catch (error) {
-      throw this.classifyWrapperError(error);
+      throw this.classifyWrapperError(error, input.data);
     }
     const contentType = response.headers.get("content-type") ?? "application/octet-stream";
     if (isTextContentType(contentType)) {
       const data = new TextDecoder().decode(bytes);
-      await this.store.saveTextResult(jobId, data);
+      await this.store.saveTextResult(input.jobId, data);
       return { data };
     }
     const mime = contentType.split(";")[0]?.trim() ?? "application/octet-stream";
-    const filePath = await this.store.saveFileResult(jobId, mime, bytes);
+    const filePath = await this.store.saveFileResult(input.jobId, mime, bytes);
     return { data: "", outputMime: mime, filePath };
   }
 };
@@ -7770,9 +8131,10 @@ async function cmdStart(nameArg, options = {}) {
       const rpcUrl = getRpcUrl(walletNetwork);
       const rpc = createSolanaRpc(rpcUrl);
       const walletAddress = address(solanaAddress);
-      const [{ value: balanceLamports }, usdcBalance] = await Promise.all([
+      const splAssets = splAssetsForNetwork(walletNetwork);
+      const [{ value: balanceLamports }, ...splBalances] = await Promise.all([
         rpc.getBalance(walletAddress).send(),
-        fetchUsdcBalance(rpc, walletAddress)
+        ...splAssets.map((asset) => fetchSplBalance(rpc, walletAddress, asset))
       ]);
       const balance = Number(balanceLamports);
       console.log("  Wallet");
@@ -7782,9 +8144,16 @@ async function cmdStart(nameArg, options = {}) {
         console.log(`     RPC      ${stripRpcSecrets(process.env.SOLANA_RPC_URL)} (custom)`);
       }
       console.log(`     SOL      ${formatSol(balance)} (${balance} lamports)`);
-      console.log(`     USDC     ${formatAssetAmount(USDC_SOLANA_DEVNET, usdcBalance)}`);
+      for (const [index, asset] of splAssets.entries()) {
+        const symbolColumn = asset.symbol.padEnd(8);
+        console.log(`     ${symbolColumn} ${formatSplBalanceValue(asset, splBalances[index])}`);
+      }
       if (balance === 0) {
-        console.log("  ! Wallet is empty. Get devnet SOL: https://faucet.solana.com");
+        if (walletNetwork === "mainnet") {
+          console.log("  ! Wallet is empty. Fund it with real SOL to operate on mainnet.");
+        } else {
+          console.log("  ! Wallet is empty. Get devnet SOL: https://faucet.solana.com");
+        }
       }
       console.log();
     } catch (e) {
@@ -7793,10 +8162,15 @@ async function cmdStart(nameArg, options = {}) {
 `);
     }
   }
+  if (walletNetwork === "mainnet") {
+    console.log(
+      "  ! Mainnet: per-skill prices are REAL funds. Review each SKILL.md price - skills copied from a devnet agent keep their absolute amounts.\n"
+    );
+  }
   const scriptEnv = buildScriptEnv(loaded.secrets);
   const paths = agentPaths(loaded.dir);
   const skillsDir = paths.skills;
-  const allSkills = loadSkillsFromDir(skillsDir, { scriptEnv });
+  const allSkills = loadSkillsFromDir(skillsDir, { network: walletNetwork, scriptEnv });
   if (allSkills.length === 0) {
     console.error(`  ! No skills found in ${skillsDir}
 `);
@@ -8009,9 +8383,9 @@ async function cmdStart(nameArg, options = {}) {
       }
     }
     for (const skill of x402Skills) {
-      if (skill.asset.mint !== USDC_SOLANA_DEVNET.mint) {
+      if (skill.asset.mint !== resolveUsdcAsset(walletNetwork).mint) {
         console.warn(
-          `  ! x402 skill "${skill.name}" is priced in ${skill.asset.symbol}, not devnet USDC - every job will be refused at preflight. Re-run \`npx @elisym/cli x402 add\`.`
+          `  ! x402 skill "${skill.name}" is priced in ${skill.asset.symbol}, not ${walletNetwork} USDC - every job will be refused at preflight. Re-run \`npx @elisym/cli x402 add\`.`
         );
       }
     }
@@ -8021,24 +8395,27 @@ async function cmdStart(nameArg, options = {}) {
         "  ! x402 skills will NOT be advertised and their jobs will be refused before payment."
       );
       console.warn("  ! Fix: re-run `npx @elisym/cli x402 add` or align elisym.yaml with the key.");
+    } else {
+      const x402RpcUrl = getRpcUrl(walletNetwork);
+      async function fetchLiveFeeBps() {
+        const config = await getProtocolConfig(
+          createSolanaRpc(x402RpcUrl),
+          getProtocolProgramId(walletNetwork),
+          walletNetwork,
+          { forceRefresh: true }
+        );
+        return config.feeBps;
+      }
+      skillCtx.x402Driver = new X402Driver({
+        agentDir: loaded.dir,
+        paymentsAddress: solanaAddress,
+        solanaSecretKeyBase58: loaded.secrets.solana_secret_key,
+        rpcUrl: x402RpcUrl,
+        network: walletNetwork,
+        getFeeBps: fetchLiveFeeBps,
+        log: (message) => console.log(`  ${message}`)
+      });
     }
-    const x402RpcUrl = getRpcUrl();
-    async function fetchLiveFeeBps() {
-      const config = await getProtocolConfig(
-        createSolanaRpc(x402RpcUrl),
-        getProtocolProgramId("devnet"),
-        { forceRefresh: true }
-      );
-      return config.feeBps;
-    }
-    skillCtx.x402Driver = new X402Driver({
-      agentDir: loaded.dir,
-      paymentsAddress: solanaAddress,
-      solanaSecretKeyBase58: loaded.secrets.solana_secret_key,
-      rpcUrl: x402RpcUrl,
-      getFeeBps: fetchLiveFeeBps,
-      log: (message) => console.log(`  ${message}`)
-    });
   }
   console.log("  Connecting to relays and publishing capabilities...");
   const identity2 = ElisymIdentity.fromHex(loaded.secrets.nostr_secret_key);
@@ -8216,11 +8593,7 @@ async function cmdStart(nameArg, options = {}) {
   const declaresDelegation = allSkills.some((skill) => skill.delegation !== void 0);
   let delegatePubkey;
   let delegateSigner;
-  if (declaresDelegation && walletNetwork !== "devnet") {
-    console.warn(
-      `  ! A skill declares delegation but it is devnet-only today (network: ${walletNetwork}) - omitted from its card(s).`
-    );
-  } else if (declaresDelegation) {
+  if (declaresDelegation) {
     const delegateSecret = loaded.secrets.solana_delegate_secret_key;
     if (delegateSecret && delegateSecret.length > 0) {
       try {
@@ -8231,7 +8604,7 @@ async function cmdStart(nameArg, options = {}) {
           const { value: delegateLamports } = await createSolanaRpc(getRpcUrl(walletNetwork)).getBalance(address(delegatePubkey)).send();
           if (delegateLamports === 0n) {
             console.warn(
-              "  ! Delegate key holds no SOL - delegated job pulls will fail on tx fees. Fund it: https://faucet.solana.com"
+              "  ! Delegate key holds no SOL - delegated job pulls will fail on tx fees. " + (walletNetwork === "mainnet" ? "Fund it with real SOL." : "Fund it: https://faucet.solana.com")
             );
           }
         } catch {
@@ -8253,38 +8626,7 @@ async function cmdStart(nameArg, options = {}) {
       console.warn(`  ! Run \`npx @elisym/cli delegate-key ${loaded.name}\` to enable it.`);
     }
   }
-  function buildCard(skill) {
-    const isStatic = skill.mode === "static-file" || skill.mode === "static-script" || skill.noInput === true;
-    return {
-      name: skill.name,
-      description: skill.description,
-      capabilities: skill.capabilities,
-      image: skill.image,
-      ...isStatic ? { static: true } : {},
-      // File-exchange hints (dynamic-script only). `inputMime` flags a file input;
-      // `inputText` tells the web whether to also show its text box for that file job.
-      ...skill.inputMime ? { inputMime: skill.inputMime } : {},
-      ...skill.inputText ? { inputText: skill.inputText } : {},
-      ...skill.outputMime ? { outputMime: skill.outputMime } : {},
-      // Conversation-context flag: clients gate chat affordances (session-carrying
-      // sends) on it. Strict true only - the read side coerces anything else away.
-      ...skill.context === true ? { context: true } : {},
-      // Delegation descriptor: only when the skill opts in AND a delegate key
-      // exists (delegatePubkey resolved). The pubkey is injected here, never
-      // taken from the SKILL.md - the operator declares only the cap/mechanism.
-      ...skill.delegation && delegatePubkey ? { delegation: { ...skill.delegation, delegate_pubkey: delegatePubkey } } : {},
-      payment: solanaAddress ? {
-        chain: "solana",
-        network: walletNetwork,
-        address: solanaAddress,
-        job_price: skill.priceSubunits,
-        token: skill.asset.token,
-        ...skill.asset.mint ? { mint: skill.asset.mint } : {},
-        decimals: skill.asset.decimals,
-        symbol: skill.asset.symbol
-      } : void 0
-    };
-  }
+  const buildCard = (skill) => buildCapabilityCard(skill, { walletNetwork, solanaAddress, delegatePubkey });
   function retiredModelKeyForSkill(skill) {
     if (skill.resolvedTriple) {
       return `${skill.resolvedTriple.provider}::${skill.resolvedTriple.model}`;
@@ -8391,7 +8733,7 @@ async function cmdStart(nameArg, options = {}) {
   if (nonceStore !== void 0) {
     await ensureGitignoreHasDelegationNoncesEntry(dirname(loaded.dir));
   }
-  const rpcUrlForLog = stripRpcSecrets(process.env.SOLANA_RPC_URL ?? getRpcUrl());
+  const rpcUrlForLog = stripRpcSecrets(process.env.SOLANA_RPC_URL ?? getRpcUrl(walletNetwork));
   logger.debug(
     {
       event: "config_resolved",
@@ -8469,6 +8811,39 @@ async function cmdStart(nameArg, options = {}) {
   console.log("  * Running. Press Ctrl+C to stop.\n");
   await runtime.run();
 }
+function buildCapabilityCard(skill, inputs) {
+  const { walletNetwork, solanaAddress, delegatePubkey } = inputs;
+  const isStatic = skill.mode === "static-file" || skill.mode === "static-script" || skill.noInput === true;
+  return {
+    name: skill.name,
+    description: skill.description,
+    capabilities: skill.capabilities,
+    image: skill.image,
+    ...isStatic ? { static: true } : {},
+    // File-exchange hints (dynamic-script only). `inputMime` flags a file input;
+    // `inputText` tells the web whether to also show its text box for that file job.
+    ...skill.inputMime ? { inputMime: skill.inputMime } : {},
+    ...skill.inputText ? { inputText: skill.inputText } : {},
+    ...skill.outputMime ? { outputMime: skill.outputMime } : {},
+    // Conversation-context flag: clients gate chat affordances (session-carrying
+    // sends) on it. Strict true only - the read side coerces anything else away.
+    ...skill.context === true ? { context: true } : {},
+    // Delegation descriptor: only when the skill opts in AND a delegate key
+    // exists (delegatePubkey resolved). The pubkey is injected here, never
+    // taken from the SKILL.md - the operator declares only the cap/mechanism.
+    ...skill.delegation && delegatePubkey ? { delegation: { ...skill.delegation, delegate_pubkey: delegatePubkey } } : {},
+    payment: solanaAddress ? {
+      chain: "solana",
+      network: walletNetwork,
+      address: solanaAddress,
+      job_price: skill.priceSubunits,
+      token: skill.asset.token,
+      ...skill.asset.mint ? { mint: skill.asset.mint } : {},
+      decimals: skill.asset.decimals,
+      symbol: skill.asset.symbol
+    } : void 0
+  };
+}
 function buildScriptEnv(secrets) {
   const scriptEnv = { ...process.env };
   delete scriptEnv.ELISYM_PASSPHRASE;
@@ -8689,15 +9064,20 @@ async function cmdWallet(name) {
   const rpcUrl = getRpcUrl(solPayment.network);
   const rpc = createSolanaRpc(rpcUrl);
   const walletAddress = address(solPayment.address);
-  const { value: balance } = await rpc.getBalance(walletAddress).send();
-  const usdcBalance = await fetchUsdcBalance(rpc, walletAddress);
+  const splAssets = splAssetsForNetwork(solPayment.network);
+  const [{ value: balance }, ...splBalances] = await Promise.all([
+    rpc.getBalance(walletAddress).send(),
+    ...splAssets.map((asset) => fetchSplBalance(rpc, walletAddress, asset))
+  ]);
   console.log(`
   Agent: ${name}`);
   console.log(`  Network: ${solPayment.network}`);
   console.log(`  Address: ${solPayment.address}`);
   console.log(`  SOL balance: ${formatSol(Number(balance))} (${balance} lamports)`);
-  console.log(`  USDC balance: ${formatAssetAmount(USDC_SOLANA_DEVNET, usdcBalance)}
-`);
+  for (const [index, asset] of splAssets.entries()) {
+    console.log(`  ${asset.symbol} balance: ${formatSplBalanceValue(asset, splBalances[index])}`);
+  }
+  console.log();
 }
 function readPackageVersion() {
   try {
@@ -8727,6 +9107,9 @@ program.command("init [name]").description("Create a new agent").option("-c, --c
   "--defaults",
   "Skip every prompt and use the same defaults the wizard would have suggested (description, default relays, no payments, no LLM, no encryption). Mutually exclusive with --config."
 ).option("--local", "Create in project <project>/.elisym/<name>/ (default: ~/.elisym/<name>/)").option(
+  "--network <network>",
+  "Solana network for the wallet entry: devnet (default) or mainnet (REAL funds, no faucet). The network is fixed at init - to go mainnet later, create a new agent."
+).option(
   "--passphrase <value>",
   'Passphrase to encrypt secrets at rest. Empty string ("") skips encryption. Also reads ELISYM_PASSPHRASE env var. When neither is provided, prompts interactively.'
 ).option(
@@ -8756,16 +9139,16 @@ program.command("list").description("List all agents (project-local and home-glo
     }
     console.log("\nAgents:");
     for (const agent of agents) {
+      const solana = await solanaLineFor(agent);
+      const shadow = agent.shadowsGlobal ? " [shadows global]" : "";
       try {
         const loaded = await loadAgent(agent.name, cwd);
         const identity2 = ElisymIdentity.fromHex(loaded.secrets.nostr_secret_key);
         const npub = nip19.npubEncode(identity2.publicKey);
-        const solAddr = loaded.yaml.payments[0]?.address ? ` | Solana: ${loaded.yaml.payments[0].address}` : "";
-        const shadow = agent.shadowsGlobal ? " [shadows global]" : "";
-        console.log(`  ${agent.name} (${agent.source})${shadow} | ${npub}${solAddr}`);
+        console.log(`  ${agent.name} (${agent.source})${shadow} | ${npub}${solana}`);
       } catch (e) {
         const hint = /encrypted secrets/i.test(e?.message ?? "") ? " (encrypted)" : "";
-        console.log(`  ${agent.name} (${agent.source})${hint}`);
+        console.log(`  ${agent.name} (${agent.source})${shadow}${hint}${solana}`);
       }
     }
     console.log();