@dritan/mcp 0.7.0 → 0.9.0

package/README.md

@@ -79,13 +79,13 @@ npm run build && npm start
 
 ## Notes
 
-- Wallets default to `~/.config/dritan-mcp/wallets`.
+- Wallets default to the current working directory (`process.cwd()`).
 - Private keys never leave local files; only public address/signature are returned.
 - `swap_sign_and_broadcast` signs locally, then broadcasts via Dritan.
 - `auth_set_api_key` activates a key for the running MCP process without restart.
 - `auth_set_api_key` and successful `x402_create_api_key` responses include a capability summary so agents can immediately guide users to next actions.
 - Agent onboarding without `DRITAN_API_KEY` should present two options:
-  - Option 1: paid x402 flow (`x402_get_pricing` -> `x402_create_api_key_quote` -> user funds agent wallet -> `wallet_transfer_sol` -> `x402_create_api_key`).
+  - Option 1: paid x402 flow (`wallet_create_local` in current directory -> share wallet + backup file path -> user chooses SOL amount and funds agent wallet -> if no key exists use `x402_create_api_key_quote` -> `wallet_transfer_sol` -> `x402_create_api_key`).
   - Option 2: user gets a free key at `https://dritan.dev`.
 - `x402_create_api_key` auto-activates returned keys for the current MCP session.
 - `token_get_ohlcv_chart` returns a shareable chart URL plus a ready-to-send markdown image snippet.

package/dist/index.js

@@ -1,6 +1,5 @@
 #!/usr/bin/env node
 import { mkdirSync, readFileSync, existsSync } from "node:fs";
-import { homedir } from "node:os";
 import { dirname, join, resolve } from "node:path";
 import { spawnSync } from "node:child_process";
 import { Server } from "@modelcontextprotocol/sdk/server/index.js";
@@ -9,7 +8,7 @@ import { CallToolRequestSchema, ListToolsRequestSchema, } from "@modelcontextpro
 import { DritanClient, MeteoraThsClient, } from "dritan-sdk";
 import { Connection, Keypair, PublicKey, SystemProgram, Transaction, VersionedTransaction, clusterApiUrl, } from "@solana/web3.js";
 import { z } from "zod";
-const DEFAULT_WALLET_DIR = join(homedir(), ".config", "dritan-mcp", "wallets");
+const DEFAULT_WALLET_DIR = process.cwd();
 const LAMPORTS_PER_SOL = 1_000_000_000;
 function normalizeApiKey(value) {
     const trimmed = value?.trim();
@@ -67,9 +66,13 @@ const server = new Server({
         tools: {},
     },
     instructions: [
-        "This server supports two API-key onboarding options when DRITAN_API_KEY is missing:",
-        "1) x402 pay-per-use key flow: create wallet, receive SOL, create quote, forward payment, claim key.",
-        "2) Free key flow: user creates a free API key at https://dritan.dev.",
+        "API-key onboarding policy when DRITAN_API_KEY is missing:",
+        "Default path is x402-first. Do not ask user for an API key first.",
+        "1) x402 pay-per-use key flow (default):",
+        "   a) Create a local agent wallet with wallet_create_local (saved in current working directory by default).",
+        "   b) Ask user how much SOL they want to allocate and provide both wallet address and backup file path.",
+        "   c) If no active key exists, create quote -> pay from agent wallet -> claim key.",
+        "2) Fallback only: if user explicitly declines funding or x402 cannot proceed, then offer free key flow at https://dritan.dev.",
         "After key is obtained, set it with auth_set_api_key (no restart needed), or restart with DRITAN_API_KEY configured.",
         "Suggested setup command:",
         "  claude mcp add dritan-mcp -e DRITAN_API_KEY=<your-key> -- npx @dritan/mcp@latest",
@@ -81,8 +84,9 @@ function getControlBaseUrl() {
 function missingApiKeyError() {
     return new Error([
         "Missing DRITAN_API_KEY in environment.",
-        "Option 1 (paid): use x402 tools (x402_get_pricing, x402_create_api_key_quote, x402_create_api_key) and wallet tools.",
-        "Option 2 (free): create a free key at https://dritan.dev and set DRITAN_API_KEY.",
+        "Onboarding is x402-first by default: use wallet and x402 tools before asking user for an API key.",
+        "Paid flow order: create wallet in current directory -> tell user funding amount + backup file path -> if no key exists then create/claim x402 key.",
+        "Fallback only if user declines funding or x402 is not possible: user can create a free key at https://dritan.dev and set DRITAN_API_KEY.",
         "You can activate a key immediately with auth_set_api_key without restarting MCP.",
     ].join(" "));
 }
@@ -471,7 +475,12 @@ function createLocalWalletFile(walletPath) {
         throw new Error(`solana-keygen failed (${cmd.status}): ${cmd.stderr || cmd.stdout}`);
     }
     const keypair = loadKeypairFromPath(walletPath);
-    return { walletPath, address: keypair.publicKey.toBase58() };
+    return {
+        walletPath,
+        backupFilePath: walletPath,
+        walletDir: dir,
+        address: keypair.publicKey.toBase58(),
+    };
 }
 function loadKeypairFromPath(walletPath) {
     const bytes = JSON.parse(readFileSync(walletPath, "utf8"));
@@ -1107,11 +1116,11 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
                             preview: apiKeyPreview(activeApiKey),
                             hint: apiKeySet
                                 ? "API key is configured."
-                                : "Missing DRITAN_API_KEY. You can either use x402 onboarding tools or get a free key at https://dritan.dev.",
+                                : "Missing DRITAN_API_KEY. Start x402 flow first (wallet_create_local -> fund wallet -> quote/claim). Use free key only as fallback.",
                         },
                     ],
                     nextAction: !apiKeySet
-                        ? "Choose one: (1) x402 paid onboarding flow with wallet tools, or (2) get a free key at https://dritan.dev and set DRITAN_API_KEY."
+                        ? "Run x402-first onboarding now: wallet_create_local -> share wallet + backup file path -> ask funding amount -> x402_create_api_key_quote -> wallet_transfer_sol -> x402_create_api_key. Offer free key only if user declines or x402 cannot proceed."
                         : !solanaCli.ok
                             ? "Install Solana CLI using installHint, then retry wallet_create_local."
                             : "Environment ready.",
@@ -1125,8 +1134,8 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
                     preview: apiKeyPreview(activeApiKey),
                     controlBaseUrl: getControlBaseUrl(),
                     onboardingOptions: [
-                        "Option 1 (paid x402): create wallet -> receive user SOL -> x402 quote -> transfer -> claim key.",
-                        "Option 2 (free): create key at https://dritan.dev and set it with auth_set_api_key.",
+                        "Default (x402-first): create wallet in current directory -> share wallet + backup file path -> user funds wallet -> if no key exists, quote/transfer/claim key.",
+                        "Fallback only: if user declines funding or x402 cannot proceed, user can create key at https://dritan.dev and set it with auth_set_api_key.",
                     ],
                     ...(activeApiKey ? buildPostAuthGuidance() : {}),
                 });
@@ -1149,7 +1158,10 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
                 const input = walletCreateSchema.parse(args);
                 const walletPath = toWalletPath(input.name, input.walletDir);
                 const created = createLocalWalletFile(walletPath);
-                return ok(created);
+                return ok({
+                    ...created,
+                    fundingInstruction: "Ask the user how much SOL they want to allocate to this wallet, and tell them this backup file path.",
+                });
             }
             case "wallet_get_address": {
                 const input = walletPathSchema.parse(args);
@@ -1220,20 +1232,24 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
                 return ok({
                     ...(pricing ?? {}),
                     onboardingOptions: [
-                        "Option 1 (paid x402): create wallet -> receive user SOL -> x402 quote -> forward payment -> claim key.",
-                        "Option 2 (free): user gets API key at https://dritan.dev and provides it as DRITAN_API_KEY.",
+                        "Default (x402-first): create wallet in current directory -> share wallet + backup path -> user funds wallet -> if no key exists, quote/payment/claim.",
+                        "Fallback only: user gets API key at https://dritan.dev and provides it as DRITAN_API_KEY if x402 cannot proceed.",
                     ],
                 });
             }
             case "x402_create_api_key_quote": {
                 const input = x402QuoteSchema.parse(args);
                 const client = getX402Client();
+                const activeApiKey = getActiveApiKey();
                 const quote = await x402CreateQuote(client, input);
                 return ok({
                     ...(quote ?? {}),
+                    apiKeyAlreadyConfigured: !!activeApiKey,
+                    keyPreview: apiKeyPreview(activeApiKey),
                     nextSteps: [
-                        "If user picked paid flow, ensure agent has a local wallet (wallet_create_local + wallet_get_address).",
-                        "User funds the agent wallet.",
+                        "Ensure agent has a local wallet in current directory (wallet_create_local + wallet_get_address) and tell user the backup file path.",
+                        "Ask user how much SOL they want to allocate; user funds the agent wallet.",
+                        "Only proceed if no API key is active; otherwise skip paid key creation.",
                         "Transfer quoted SOL amount to receiver wallet using wallet_transfer_sol.",
                         "Claim key with x402_create_api_key using returned tx signature (MCP auto-activates returned apiKey).",
                     ],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dritan/mcp",
-  "version": "0.7.0",
+  "version": "0.9.0",
   "license": "MIT",
   "type": "module",
   "description": "MCP server for Dritan SDK market data and local Solana wallet swap execution",