@elisym/mcp 0.3.1 → 0.3.3

package/README.md

@@ -106,15 +106,15 @@ The bootstrap step is unchanged - the wizard collects the passphrase interactive
 
 ## Environment Variables
 
-| Variable                    | Description                                                                   |
-| --------------------------- | ----------------------------------------------------------------------------- |
-| `ELISYM_AGENT`              | Load agent from `~/.elisym/agents/<name>/`                                    |
-| `ELISYM_NOSTR_SECRET`       | Nostr secret key (hex or nsec) for ephemeral mode                             |
-| `ELISYM_AGENT_NAME`         | Agent display name (default: mcp-agent)                                       |
-| `ELISYM_NETWORK`            | Solana network for ephemeral mode: `devnet` or `mainnet` (default: devnet)    |
-| `ELISYM_PASSPHRASE`         | Passphrase for encrypted agent configs (optional)                             |
-| `ELISYM_ALLOW_WITHDRAWAL`   | Set to `1` to override per-agent `security.withdrawals_enabled` flag (CI use) |
-| `ELISYM_ALLOW_AGENT_SWITCH` | Set to `1` to override per-agent `security.agent_switch_enabled` flag         |
+| Variable                    | Description                                                                     |
+| --------------------------- | ------------------------------------------------------------------------------- |
+| `ELISYM_AGENT`              | Load agent from `~/.elisym/agents/<name>/`                                      |
+| `ELISYM_NOSTR_SECRET`       | Nostr secret key (hex or nsec) for ephemeral mode                               |
+| `ELISYM_AGENT_NAME`         | Agent display name (default: mcp-agent)                                         |
+| `ELISYM_NETWORK`            | Solana network for ephemeral mode. Only `devnet` is supported (default: devnet) |
+| `ELISYM_PASSPHRASE`         | Passphrase for encrypted agent configs (optional)                               |
+| `ELISYM_ALLOW_WITHDRAWAL`   | Set to `1` to override per-agent `security.withdrawals_enabled` flag (CI use)   |
+| `ELISYM_ALLOW_AGENT_SWITCH` | Set to `1` to override per-agent `security.agent_switch_enabled` flag           |
 
 ## Usage Examples
 

package/dist/index.js

@@ -42,8 +42,16 @@ function agentsDir() {
 function agentConfigPath(name) {
   return join(agentsDir(), name, "config.json");
 }
-function coerceNetwork(raw) {
-  return raw === "mainnet" ? "mainnet" : "devnet";
+function coerceNetwork(raw, agentName) {
+  if (raw === void 0 || raw === "devnet") {
+    return "devnet";
+  }
+  if (raw === "mainnet") {
+    throw new Error(
+      `Agent "${agentName}" is configured for mainnet, which is not supported until the elisym-config program is deployed there. Re-create the agent with --network devnet: rm -rf ~/.elisym/agents/${agentName} && elisym-mcp init ${agentName} --network devnet`
+    );
+  }
+  throw new Error(`Agent "${agentName}" has unsupported network "${raw}". Expected "devnet".`);
 }
 async function loadAgentConfig(name, passphrase) {
   validateAgentName(name);
@@ -65,7 +73,7 @@ async function loadAgentConfig(name, passphrase) {
       `Failed to load agent "${name}": ${msg}. If this config was created by an earlier version, delete ~/.elisym/agents/${name} and run "elisym-mcp init ${name}" again.`
     );
   }
-  const network = coerceNetwork(config.wallet?.network ?? config.payments?.[0]?.network);
+  const network = coerceNetwork(config.wallet?.network ?? config.payments?.[0]?.network, name);
   return {
     nostrSecretKey: config.identity.secret_key,
     solanaSecretKey: config.wallet?.secret_key,
@@ -160,18 +168,17 @@ async function listAgentNames() {
     return [];
   }
 }
-function rpcUrlFor(network) {
-  return network === "mainnet" ? "https://api.mainnet-beta.solana.com" : "https://api.devnet.solana.com";
+function rpcUrlFor(_network) {
+  return "https://api.devnet.solana.com";
 }
-async function fetchProtocolConfig(network) {
-  const cluster = network === "mainnet" ? "mainnet" : "devnet";
-  const programId = getProtocolProgramId(cluster);
-  const rpc = createSolanaRpc(rpcUrlFor(cluster));
+async function fetchProtocolConfig(_network) {
+  const programId = getProtocolProgramId("devnet");
+  const rpc = createSolanaRpc(rpcUrlFor());
   const config = await getProtocolConfig(rpc, programId, { forceRefresh: true });
   return { feeBps: config.feeBps, treasury: config.treasury };
 }
-function explorerClusterFor(network) {
-  return network === "mainnet" ? "mainnet-beta" : "devnet";
+function explorerClusterFor(_network) {
+  return "devnet";
 }
 var RateLimiter = class {
   constructor(maxCalls, windowSecs) {
@@ -632,7 +639,10 @@ var CreateAgentSchema = z.object({
   // customer-mode in 0.1.x and never publishes a NIP-89 capability card,
   // so an advertised capability list would be misleading. Provider-mode
   // (0.2.0) will reintroduce this field.
-  network: z.enum(["devnet", "mainnet"]).default("devnet"),
+  // Only devnet is supported until the elisym-config program ships on mainnet.
+  // Mainnet was previously advertised here but every paid flow then crashed at
+  // payment time - rejecting at schema level surfaces the error up front.
+  network: z.enum(["devnet"]).default("devnet"),
   passphrase: z.string().optional().describe("Optional passphrase; if set, secret keys are encrypted at rest."),
   activate: z.boolean().default(true)
 });
@@ -1072,6 +1082,7 @@ function sanitizeField(input, maxLen) {
 }
 
 // src/tools/customer.ts
+var PRE_PING_TIMEOUT_MS = 5e3;
 var CreateJobSchema = z.object({
   input: z.string().describe("The job prompt/input sent to the provider."),
   capability: z.string().min(1).max(64).default("general").describe("Short tag selecting which capability of the provider to invoke."),
@@ -1192,18 +1203,34 @@ function makePaymentFeedbackHandler(opts) {
       );
       return;
     }
-    if (opts.maxPriceLamports === void 0 && amount !== void 0 && amount > 0) {
+    let parsedRequest;
+    try {
+      parsedRequest = JSON.parse(paymentRequest);
+    } catch {
+      opts.rejectPayment(new Error("Provider sent a malformed payment_request (not valid JSON)."));
+      return;
+    }
+    const signedAmount = typeof parsedRequest.amount === "number" && Number.isInteger(parsedRequest.amount) && parsedRequest.amount > 0 ? parsedRequest.amount : void 0;
+    if (amount !== void 0 && amount > 0 && signedAmount !== void 0 && amount !== signedAmount) {
       opts.rejectPayment(
         new Error(
-          `Payment of ${formatSol(BigInt(amount))} required but no max_price_lamports set. Retry with max_price_lamports to approve.`
+          `Payment request mismatch: feedback tag amount=${amount} differs from signed amount=${signedAmount}. Refusing to proceed.`
         )
       );
       return;
     }
-    if (opts.maxPriceLamports !== void 0 && amount !== void 0 && amount > opts.maxPriceLamports) {
+    if (opts.maxPriceLamports === void 0 && signedAmount !== void 0) {
       opts.rejectPayment(
         new Error(
-          `Price ${formatSol(BigInt(amount))} exceeds max ${formatSol(BigInt(opts.maxPriceLamports))}`
+          `Payment of ${formatSol(BigInt(signedAmount))} required but no max_price_lamports set. Retry with max_price_lamports to approve.`
+        )
+      );
+      return;
+    }
+    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))}`
         )
       );
       return;
@@ -1211,7 +1238,7 @@ function makePaymentFeedbackHandler(opts) {
     if (!opts.agent.solanaKeypair) {
       opts.resolveNoWallet(
         `Payment required but no Solana wallet configured.
-Amount: ${amount ? formatSol(BigInt(amount)) : "unknown"}
+Amount: ${signedAmount !== void 0 ? formatSol(BigInt(signedAmount)) : "unknown"}
 Payment request: ${paymentRequest}`
       );
       return;
@@ -1445,6 +1472,12 @@ ${wrapped}`);
       const timeout = Math.min(input.timeout_secs, MAX_TIMEOUT_SECS) * 1e3;
       const agent = ctx.active();
       const providerPubkey = decodeNpub(input.provider_npub);
+      const ping = await agent.client.ping.pingAgent(providerPubkey, PRE_PING_TIMEOUT_MS);
+      if (!ping.online) {
+        return errorResult(
+          `Provider ${input.provider_npub} is offline. Run search_agents to find currently-online providers.`
+        );
+      }
       const providers = await agent.client.discovery.fetchAgents(agent.network);
       const provider = providers.find((a) => a.npub === input.provider_npub);
       if (!provider) {
@@ -1526,6 +1559,12 @@ ${result}`);
       const agent = ctx.active();
       const providerPubkey = decodeNpub(input.provider_npub);
       const dTag = toDTag(input.capability);
+      const ping = await agent.client.ping.pingAgent(providerPubkey, PRE_PING_TIMEOUT_MS);
+      if (!ping.online) {
+        return errorResult(
+          `Provider ${input.provider_npub} is offline. Run search_agents to find currently-online providers.`
+        );
+      }
       const agents = await agent.client.discovery.fetchAgents(agent.network);
       const provider = agents.find((a) => a.npub === input.provider_npub);
       if (!provider) {
@@ -1629,7 +1668,7 @@ ${result}`);
 var GetDashboardSchema = z.object({
   top_n: z.number().int().min(1).max(100).default(10),
   chain: z.enum(["solana"]).default("solana"),
-  network: z.enum(["devnet", "mainnet"]).optional(),
+  network: z.enum(["devnet"]).optional(),
   timeout_secs: z.number().int().min(1).max(60).default(15)
 });
 var dashboardTools = [
@@ -1667,6 +1706,8 @@ ${text}`);
     }
   })
 ];
+var LAST_SEEN_ONLINE_WINDOW_SECS = 10 * 60;
+var SEARCH_PING_TIMEOUT_MS = 3e3;
 var STOP_WORDS = /* @__PURE__ */ new Set([
   "a",
   "an",
@@ -1800,28 +1841,19 @@ var SearchAgentsSchema = z.object({
   capabilities: z.array(z.string()).min(1).describe("OR-matched substring filter on agent names, descriptions, and capability tags."),
   query: z.string().optional().describe("Optional secondary scoring for re-ranking. Omit when you have precise tokens."),
   max_price_lamports: z.number().int().optional(),
-  // rename in description so it's obvious we're using a heuristic freshness signal,
-  // not a live reachability probe.
-  recently_active_only: z.boolean().default(true).describe(
-    "If true, only return agents with job activity in the last hour. Not a liveness probe."
+  include_offline: z.boolean().default(false).describe(
+    "If true, skip the live online check and return agents regardless of reachability. Default: false - only currently-online agents are returned."
   )
 });
 var ListCapabilitiesSchema = z.object({});
 var GetIdentitySchema = z.object({});
-var PingAgentSchema = z.object({
-  agent_npub: z.string(),
-  // single source of truth for the default.
-  timeout_secs: z.number().int().min(1).max(600).default(15)
-});
 var discoveryTools = [
   defineTool({
     name: "search_agents",
-    // previous description was ~90 tokens and was truncated by some MCP clients.
-    // Keep the operational rules short; schema `.describe()` fields carry the detail.
-    description: "Search AI agents. `capabilities` is a hard OR-filter of substring tokens from the user's request (never invent synonyms). `query` is optional re-ranking; omit if not needed.",
+    description: "Search AI agents currently online on elisym. `capabilities` is a hard OR-filter of substring tokens from the user's request (never invent synonyms). `query` is optional re-ranking; omit if not needed. Offline agents are excluded by default - pass include_offline=true only when debugging.",
     schema: SearchAgentsSchema,
     async handler(ctx, input) {
-      const { capabilities, query, max_price_lamports, recently_active_only } = input;
+      const { capabilities, query, max_price_lamports, include_offline } = input;
       if (capabilities.length > MAX_CAPABILITIES) {
         return errorResult(`Too many capabilities (max ${MAX_CAPABILITIES})`);
       }
@@ -1834,10 +1866,6 @@ var discoveryTools = [
           )
         )
       );
-      if (recently_active_only) {
-        const activeThreshold = Math.floor(Date.now() / 1e3) - 60 * 60;
-        filtered = filtered.filter((a) => a.lastSeen >= activeThreshold);
-      }
       if (max_price_lamports !== void 0) {
         filtered = filtered.filter(
           (a) => a.cards.some(
@@ -1845,6 +1873,25 @@ var discoveryTools = [
           )
         );
       }
+      if (!include_offline) {
+        const freshThreshold = Math.floor(Date.now() / 1e3) - LAST_SEEN_ONLINE_WINDOW_SECS;
+        filtered = filtered.filter((a) => a.lastSeen >= freshThreshold);
+        if (filtered.length > 0) {
+          const probes = await Promise.allSettled(
+            filtered.map(
+              (candidate) => agent.client.ping.pingAgent(candidate.pubkey, SEARCH_PING_TIMEOUT_MS)
+            )
+          );
+          const survivors = [];
+          filtered.forEach((candidate, index) => {
+            const probe = probes[index];
+            if (probe?.status === "fulfilled" && probe.value.online) {
+              survivors.push(candidate);
+            }
+          });
+          filtered = survivors;
+        }
+      }
       if (query) {
         const isAscii = /^[\u0000-\u007F]*$/.test(query);
         const words = query.toLowerCase().split(/\s+/).filter((w) => w.length > 1 && (!isAscii || !STOP_WORDS.has(w)));
@@ -1865,7 +1912,7 @@ var discoveryTools = [
       }
       if (filtered.length === 0) {
         return textResult(
-          recently_active_only ? "No recently-active agents found matching those capabilities. Try with recently_active_only=false." : "No agents found matching those capabilities."
+          include_offline ? "No agents found matching those capabilities." : "No online agents found matching those capabilities. Retry shortly or pass include_offline=true to see unreachable matches."
         );
       }
       const results = filtered.map((a) => ({
@@ -1927,31 +1974,6 @@ ${text}`);
         )
       );
     }
-  }),
-  defineTool({
-    name: "ping_agent",
-    description: "Ping an agent to check if it's online. Sends an encrypted heartbeat and waits for a pong.",
-    schema: PingAgentSchema,
-    async handler(ctx, input) {
-      ctx.toolRateLimiter.check();
-      const { agent_npub, timeout_secs } = input;
-      const agent = ctx.active();
-      let pubkey;
-      try {
-        const decoded = nip19.decode(agent_npub);
-        if (decoded.type !== "npub") {
-          return errorResult(`Expected npub, got ${decoded.type}`);
-        }
-        pubkey = decoded.data;
-      } catch {
-        return errorResult(`Invalid npub: ${agent_npub}`);
-      }
-      const timeoutMs = timeout_secs * 1e3;
-      const result = await agent.client.ping.pingAgent(pubkey, timeoutMs);
-      return textResult(
-        result.online ? `Agent ${agent_npub} is online.` : `Agent ${agent_npub} did not respond within ${timeout_secs}s.`
-      );
-    }
   })
 ];
 var GetBalanceSchema = z.object({});
@@ -2415,9 +2437,14 @@ program.action(async () => {
     }
     const client = new ElisymClient({ relays: RELAYS });
     const name = process.env.ELISYM_AGENT_NAME ?? "mcp-agent";
-    const network = process.env.ELISYM_NETWORK === "mainnet" ? "mainnet" : "devnet";
-    ctx.register({ client, identity, name, network, security: {} });
-    console.error(`Ephemeral agent: ${name} (${network})`);
+    if (process.env.ELISYM_NETWORK && process.env.ELISYM_NETWORK !== "devnet") {
+      console.error(
+        `ELISYM_NETWORK="${process.env.ELISYM_NETWORK}" is not supported. Only "devnet" is available until the on-chain protocol program ships on mainnet.`
+      );
+      process.exit(1);
+    }
+    ctx.register({ client, identity, name, network: "devnet", security: {} });
+    console.error(`Ephemeral agent: ${name} (devnet)`);
   } else {
     const names = (await listAgentNames()).slice().sort();
     if (names.length > 0) {
@@ -2440,7 +2467,7 @@ program.action(async () => {
   }
   await startServer(ctx);
 });
-program.command("init [name]").description("Create a new agent identity").option("-d, --description <desc>", "Agent description", "Elisym MCP agent").option("-n, --network <network>", "Solana network (devnet|mainnet)", "devnet").option("--install", "Also install into MCP clients").action(async (name, options) => {
+program.command("init [name]").description("Create a new agent identity").option("-d, --description <desc>", "Agent description", "Elisym MCP agent").option("-n, --network <network>", "Solana network (devnet only)", "devnet").option("--install", "Also install into MCP clients").action(async (name, options) => {
   const { default: inquirer } = await import('inquirer');
   if (!name) {
     const answers = await inquirer.prompt([
@@ -2460,8 +2487,8 @@ program.command("init [name]").description("Create a new agent identity").option
         type: "list",
         name: "network",
         message: "Solana network:",
-        // testnet removed - only devnet and mainnet are supported.
-        choices: ["devnet", "mainnet"],
+        // Only devnet is supported until the elisym-config program ships on mainnet.
+        choices: ["devnet"],
         default: "devnet"
       }
     ]);
@@ -2469,8 +2496,10 @@ program.command("init [name]").description("Create a new agent identity").option
     options.description = answers.description;
     options.network = answers.network;
   }
-  if (options.network !== "devnet" && options.network !== "mainnet") {
-    console.error(`Network must be "devnet" or "mainnet", got "${options.network}".`);
+  if (options.network !== "devnet") {
+    console.error(
+      `Network must be "devnet", got "${options.network}". Mainnet is not supported until the on-chain protocol program is deployed.`
+    );
     process.exit(1);
   }
   const { passphrase } = await inquirer.prompt([
@@ -2492,7 +2521,7 @@ program.command("init [name]").description("Create a new agent identity").option
     nostrSecretKey: Buffer.from(nostrSecretKey).toString("hex"),
     solanaSecretKey: bs58.encode(solanaSecretBytes),
     solanaAddress: solanaSigner.address,
-    network: options.network,
+    network: "devnet",
     security: { withdrawals_enabled: false, agent_switch_enabled: false },
     passphrase: passphrase || void 0
   });