@agentwonderland/mcp 0.1.41 → 0.1.43

package/dist/core/__tests__/api-client.test.js

@@ -46,7 +46,7 @@ describe("api-client headers", () => {
                 "X-AW-Consumer-Principal": "did:pkh:solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp:42W2HfLfveSm1T5et9WTLp2CZ2QXdF2EYCUvyJ2gPpxF",
                 "X-AW-Rebate-Principal": "did:pkh:eip155:8453:0xbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
                 "X-AW-Surface": "mcp",
-                "X-AW-MCP-Version": "0.1.41",
+                "X-AW-MCP-Version": "0.1.43",
                 "X-AW-MCP-Tool": "run_agent",
                 "X-AW-MCP-Action": "execute",
             }),

package/dist/core/__tests__/setup.test.js

@@ -20,7 +20,7 @@ describe("MCP setup", () => {
         expect(next.mcpServers.existing.command).toBe("node");
         expect(next.mcpServers.agentwonderland).toEqual({
             command: "npx",
-            args: ["-y", "@agentwonderland/mcp"],
+            args: ["-y", "@agentwonderland/mcp@latest"],
         });
     });
     it("replaces an existing Codex TOML block without disturbing other servers", () => {
@@ -40,7 +40,7 @@ describe("MCP setup", () => {
         expect(next).toContain("[mcp_servers.other]");
         expect(next).toContain("[mcp_servers.agentwonderland]");
         expect(next).toContain('command = "npx"');
-        expect(next).toContain('args = ["-y", "@agentwonderland/mcp"]');
+        expect(next).toContain('args = ["-y", "@agentwonderland/mcp@latest"]');
         expect(next).not.toContain('command = "old"');
         expect(next).toContain("[model_provider.openai]");
     });
@@ -61,7 +61,7 @@ describe("MCP setup", () => {
         const written = JSON.parse(await readFile(configPath, "utf8"));
         expect(result.status).toBe("updated");
         expect(result.backupPath).toBeTruthy();
-        expect(written.mcpServers.agentwonderland.args).toEqual(["-y", "@agentwonderland/mcp"]);
+        expect(written.mcpServers.agentwonderland.args).toEqual(["-y", "@agentwonderland/mcp@latest"]);
     });
     it("parses client selection flags", () => {
         expect(parseSetupArgs(["--clients", "codex,cursor", "--yes"])).toEqual({

package/dist/core/api-client.js

@@ -1,6 +1,7 @@
 import { getApiUrl, getApiKey } from "./config.js";
 import { getPaymentFetch } from "./payments.js";
 import { getBaseRebatePrincipal, ensureConsumerPrincipalForMethod, getConsumerPrincipalForMethod, } from "./principal.js";
+import { MCP_PACKAGE_VERSION } from "./version.js";
 // ── Error class ────────────────────────────────────────────────────
 export class ApiError extends Error {
     status;
@@ -12,7 +13,6 @@ export class ApiError extends Error {
         this.name = "ApiError";
     }
 }
-const MCP_VERSION = "0.1.41";
 function inferToolHeaders(path, method) {
     if (path === "/solve") {
         return { "X-AW-MCP-Tool": "solve", "X-AW-MCP-Action": method === "POST" ? "execute" : "view" };
@@ -36,7 +36,7 @@ async function buildHeaders(path, method, options) {
         "Content-Type": "application/json",
         Accept: "application/json",
         "X-AW-Surface": "mcp",
-        "X-AW-MCP-Version": MCP_VERSION,
+        "X-AW-MCP-Version": MCP_PACKAGE_VERSION,
         ...inferToolHeaders(path, method),
     };
     const apiKey = getApiKey();

package/dist/core/ows-adapter.js

@@ -7,6 +7,9 @@
  * The OWS SDK (`@open-wallet-standard/core`) is a NAPI native module.
  * ALL imports are dynamic so the MCP server works without OWS installed.
  */
+import { createHmac } from "node:crypto";
+import { mnemonicToSeedSync, validateMnemonic } from "@scure/bip39";
+import { wordlist } from "@scure/bip39/wordlists/english";
 // ── Helpers ──────────────────────────────────────────────────────
 const OWS_INSTALL_HINT = "OWS is not installed. Install with: npm install -g @open-wallet-standard/core";
 async function loadOws() {
@@ -58,6 +61,51 @@ function keypairFromEd25519Hex(privateKeyHex, KeypairCtor) {
     }
     throw new Error(`Unsupported ed25519 key length: ${bytes.length} bytes.`);
 }
+function parseExportedSecret(exported) {
+    const secret = exported.trim();
+    try {
+        const parsed = JSON.parse(secret);
+        if (parsed.secp256k1 || parsed.ed25519 || parsed.mnemonic)
+            return parsed;
+    }
+    catch {
+        // OWS-created wallets export a BIP-39 mnemonic, not a JSON key object.
+    }
+    const hex = secret.startsWith("0x") ? secret.slice(2) : secret;
+    if (/^[0-9a-fA-F]+$/.test(hex)) {
+        if (hex.length === 64)
+            return { secp256k1: hex, ed25519: hex };
+        if (hex.length === 128)
+            return { ed25519: hex };
+    }
+    if (validateMnemonic(secret, wordlist)) {
+        return { mnemonic: secret };
+    }
+    return {};
+}
+function deriveSolanaSeedFromMnemonic(mnemonic, path = "m/44'/501'/0'/0'") {
+    const seed = mnemonicToSeedSync(mnemonic);
+    let digest = createHmac("sha512", "ed25519 seed").update(seed).digest();
+    let key = digest.subarray(0, 32);
+    let chainCode = digest.subarray(32);
+    for (const part of path.split("/").slice(1)) {
+        if (!part.endsWith("'")) {
+            throw new Error(`Unsupported non-hardened ed25519 path segment: ${part}`);
+        }
+        const index = Number(part.slice(0, -1));
+        if (!Number.isInteger(index) || index < 0) {
+            throw new Error(`Unsupported ed25519 path segment: ${part}`);
+        }
+        const data = Buffer.alloc(37);
+        data[0] = 0;
+        Buffer.from(key).copy(data, 1);
+        data.writeUInt32BE(index + 0x80000000, 33);
+        digest = createHmac("sha512", chainCode).update(data).digest();
+        key = digest.subarray(0, 32);
+        chainCode = digest.subarray(32);
+    }
+    return Uint8Array.from(key);
+}
 // ── Public API ───────────────────────────────────────────────────
 /**
  * Check whether the OWS native module can be loaded.
@@ -160,7 +208,11 @@ export async function owsAccountFromWalletId(walletId, _chain) {
     // (EIP-5806 delegate calls) which OWS's native signing can't serialize.
     // OWS provides encrypted storage at rest; viem handles signing in memory.
     const exported = ows.exportWallet(walletId);
-    const keys = JSON.parse(exported);
+    const keys = parseExportedSecret(exported);
+    if (keys.mnemonic) {
+        const { mnemonicToAccount } = await import("viem/accounts");
+        return mnemonicToAccount(keys.mnemonic);
+    }
     if (!keys.secp256k1) {
         throw new Error(`Wallet "${wallet.name}" has no secp256k1 key for EVM signing.`);
     }
@@ -172,11 +224,14 @@ export async function owsSolanaKeypairFromWalletId(walletId) {
     const wallet = ows.getWallet(walletId);
     findSolanaAccount(wallet);
     const exported = ows.exportWallet(walletId);
-    const keys = JSON.parse(exported);
+    const keys = parseExportedSecret(exported);
+    const { Keypair } = await import("@solana/web3.js");
+    if (keys.mnemonic) {
+        return Keypair.fromSeed(deriveSolanaSeedFromMnemonic(keys.mnemonic));
+    }
     if (!keys.ed25519) {
         throw new Error(`Wallet "${wallet.name}" has no ed25519 key for Solana signing.`);
     }
-    const { Keypair } = await import("@solana/web3.js");
     return keypairFromEd25519Hex(keys.ed25519, Keypair);
 }
 export async function getOwsWalletAddress(walletId, chain = "evm") {

package/dist/core/payments.js

@@ -53,52 +53,42 @@ function clearStaleCardCache(activeKey) {
 }
 // ── Per-protocol initializers ───────────────────────────────────
 async function initEvmMppForChain(wallet, chain) {
-    try {
-        const { Mppx } = await import("./mpp-client.js");
-        let account;
-        if (wallet.keyType === "ows" && wallet.owsWalletId) {
-            const { owsAccountFromWalletId } = await import("./ows-adapter.js");
-            account = await owsAccountFromWalletId(wallet.owsWalletId);
-        }
-        else if (wallet.key) {
-            const { privateKeyToAccount } = await import("viem/accounts");
-            account = privateKeyToAccount(normalizeKey(wallet.key));
-        }
-        else {
-            return null;
-        }
-        const methods = [];
-        if (chain === "tempo") {
-            const { tempoChargeClient } = await import("./tempo-charge.js");
-            methods.push(tempoChargeClient({ account }));
-        }
-        else {
-            const { baseChargeClient } = await import("./base-charge.js");
-            methods.push(baseChargeClient({ account }));
-        }
-        const mppx = Mppx.create({ methods: methods, polyfill: false });
-        return mppx.fetch.bind(mppx);
+    const { Mppx } = await import("./mpp-client.js");
+    let account;
+    if (wallet.keyType === "ows" && wallet.owsWalletId) {
+        const { owsAccountFromWalletId } = await import("./ows-adapter.js");
+        account = await owsAccountFromWalletId(wallet.owsWalletId);
     }
-    catch {
+    else if (wallet.key) {
+        const { privateKeyToAccount } = await import("viem/accounts");
+        account = privateKeyToAccount(normalizeKey(wallet.key));
+    }
+    else {
         return null;
     }
+    const methods = [];
+    if (chain === "tempo") {
+        const { tempoChargeClient } = await import("./tempo-charge.js");
+        methods.push(tempoChargeClient({ account }));
+    }
+    else {
+        const { baseChargeClient } = await import("./base-charge.js");
+        methods.push(baseChargeClient({ account }));
+    }
+    const mppx = Mppx.create({ methods: methods, polyfill: false });
+    return mppx.fetch.bind(mppx);
 }
 async function initSolanaMpp(wallet) {
-    try {
-        if (wallet.keyType !== "ows" && !wallet.key) {
-            return null;
-        }
-        const { Mppx } = await import("./mpp-client.js");
-        const { solanaChargeClient } = await import("./solana-charge.js");
-        const mppx = Mppx.create({
-            methods: [solanaChargeClient({ wallet })],
-            polyfill: false,
-        });
-        return mppx.fetch.bind(mppx);
-    }
-    catch {
+    if (wallet.keyType !== "ows" && !wallet.key) {
         return null;
     }
+    const { Mppx } = await import("./mpp-client.js");
+    const { solanaChargeClient } = await import("./solana-charge.js");
+    const mppx = Mppx.create({
+        methods: [solanaChargeClient({ wallet })],
+        polyfill: false,
+    });
+    return mppx.fetch.bind(mppx);
 }
 async function initCard() {
     const cardConfig = getCardConfig();
@@ -149,6 +139,10 @@ async function initForChain(wallet, chain) {
     }
     return null;
 }
+function initFailureMessage(method, wallet, chain, err) {
+    const reason = err instanceof Error ? err.message : String(err);
+    return `Payment method "${method}" is configured as ${chain} on wallet "${wallet.id}", but the signer could not initialize: ${reason}`;
+}
 // ── Public API ──────────────────────────────────────────────────
 /**
  * Returns a payment-aware fetch for a specific method, or the best
@@ -185,7 +179,13 @@ export async function getPaymentFetch(method) {
         const ck = cacheKey(resolved.wallet.id, resolved.chain);
         if (fetchCache.has(ck))
             return fetchCache.get(ck);
-        const pf = await initForChain(resolved.wallet, resolved.chain);
+        let pf;
+        try {
+            pf = await initForChain(resolved.wallet, resolved.chain);
+        }
+        catch (err) {
+            throw new Error(initFailureMessage(method, resolved.wallet, resolved.chain, err));
+        }
         if (pf) {
             fetchCache.set(ck, pf);
             return pf;
@@ -234,7 +234,18 @@ export async function getPaymentFetch(method) {
         const ck = cacheKey(resolved.wallet.id, resolved.chain);
         if (fetchCache.has(ck))
             return fetchCache.get(ck);
-        const pf = await initForChain(resolved.wallet, resolved.chain);
+        let pf;
+        try {
+            pf = await initForChain(resolved.wallet, resolved.chain);
+        }
+        catch (err) {
+            if (m === defaultMethod) {
+                const others = configured.filter((x) => x !== m);
+                const altText = others.length > 0 ? ` Alternatives: ${others.join(", ")}` : "";
+                throw new Error(`${initFailureMessage(m, resolved.wallet, resolved.chain, err)}.${altText}`);
+            }
+            continue;
+        }
         if (pf) {
             fetchCache.set(ck, pf);
             return pf;

package/dist/core/version.d.ts

@@ -0,0 +1 @@
+export declare const MCP_PACKAGE_VERSION = "0.1.43";

package/dist/core/version.js

@@ -0,0 +1 @@
+export const MCP_PACKAGE_VERSION = "0.1.43";

package/dist/index.js

@@ -22,7 +22,7 @@ import { registerJobResources } from "./resources/jobs.js";
 // ── Prompts ──────────────────────────────────────────────────────
 import { registerPrompts } from "./prompts/index.js";
 import { runSetupCli } from "./setup.js";
-const PACKAGE_VERSION = "0.1.41";
+import { MCP_PACKAGE_VERSION } from "./core/version.js";
 export async function startMcpServer() {
     const server = new McpServer({
         name: "agentwonderland",
@@ -115,7 +115,7 @@ if (isCli) {
             "in a terminal it waits silently for MCP JSON-RPC messages on stdin.",
             "",
             "MCP client config:",
-            '  { "mcpServers": { "agentwonderland": { "command": "npx", "args": ["-y", "@agentwonderland/mcp"] } } }',
+            '  { "mcpServers": { "agentwonderland": { "command": "npx", "args": ["-y", "@agentwonderland/mcp@latest"] } } }',
             "",
             "Options:",
             "  -h, --help     Show this help",
@@ -124,7 +124,7 @@ if (isCli) {
         process.exit(0);
     }
     else if (args.includes("--version") || args.includes("-v")) {
-        console.log(PACKAGE_VERSION);
+        console.log(MCP_PACKAGE_VERSION);
         process.exit(0);
     }
     else {

package/dist/setup.js

@@ -8,7 +8,7 @@ import { execFileSync } from "node:child_process";
 export const SERVER_NAME = "agentwonderland";
 export const SERVER_CONFIG = {
     command: "npx",
-    args: ["-y", "@agentwonderland/mcp"],
+    args: ["-y", "@agentwonderland/mcp@latest"],
 };
 const CLIENT_ORDER = [
     "codex",
@@ -272,7 +272,7 @@ export function mergeCodexTomlConfig(existing) {
     const block = [
         `[mcp_servers.${SERVER_NAME}]`,
         `command = "npx"`,
-        `args = ["-y", "@agentwonderland/mcp"]`,
+        `args = ["-y", "@agentwonderland/mcp@latest"]`,
         "",
     ].join("\n");
     const pattern = new RegExp(`\\n?\\[mcp_servers\\.${SERVER_NAME.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}\\][\\s\\S]*?(?=\\n\\[[^\\]]+\\]|$)`);

package/dist/tools/wallet.js

@@ -6,6 +6,7 @@ import { getSettings } from "../core/settings.js";
 import { getOrCreatePendingCardSetup, formatCardSetupBlocks, getCardCapabilities, pollCardSetup, } from "../core/card-setup.js";
 import { isOwsAvailable, createOwsWallet, importKeyToOws, listOwsWallets, listOwsWalletsByChain, installOws, platformSupportsOws, } from "../core/ows-adapter.js";
 import { ensureConsumerPrincipal, getConsumerPrincipal } from "../core/principal.js";
+import { MCP_PACKAGE_VERSION } from "../core/version.js";
 function text(t) {
     return { content: [{ type: "text", text: t }] };
 }
@@ -21,7 +22,10 @@ export function registerWalletTools(server) {
         }
         const settings = await getSettings();
         const networkLabel = settings ? ` (${settings.network})` : "";
-        const lines = [`Payment methods${networkLabel}:`];
+        const lines = [
+            `Agent Wonderland MCP: ${MCP_PACKAGE_VERSION}`,
+            `Payment methods${networkLabel}:`,
+        ];
         for (const w of wallets) {
             const label = w.label ? ` (${w.label})` : "";
             const storage = w.keyType === "ows" ? " [encrypted]" : " [plaintext]";
@@ -213,6 +217,8 @@ export function registerWalletTools(server) {
                         "",
                         chainStatus,
                         "",
+                        "No MCP restart is required for wallet changes.",
+                        "",
                         `Fund this address with USDC on ${defaultCh === "solana" ? "Solana" : "Tempo"} to start using agents.`,
                     ].join("\n"));
                 }
@@ -244,6 +250,8 @@ export function registerWalletTools(server) {
                         `  Chains: solana`,
                         `  Consumer principal: ${principal}`,
                         "",
+                        "No MCP restart is required for wallet changes.",
+                        "",
                         "Fund this address with USDC on Solana to start using agents.",
                     ].join("\n") + owsNudge);
                 }
@@ -269,6 +277,8 @@ export function registerWalletTools(server) {
                     `  Chains: tempo, base`,
                     `  Consumer principal: ${principal}`,
                     "",
+                    "No MCP restart is required for wallet changes.",
+                    "",
                     `Fund this address with USDC on Tempo or Base to start using agents.`,
                 ].join("\n") + owsNudge);
             }
@@ -293,6 +303,8 @@ export function registerWalletTools(server) {
                 `  Storage: ~/.ows/ (AES-256-GCM encrypted)`,
                 `  Consumer principal: ${principal}`,
                 "",
+                "No MCP restart is required for wallet changes.",
+                "",
                 `Fund this address with USDC on ${defaultCh === "solana" ? "Solana" : "Tempo"} to start using agents.`,
                 "For testnet: npx mppx account fund",
             ].join("\n"));
@@ -317,6 +329,8 @@ export function registerWalletTools(server) {
                 `  Name: ${walletName}`,
                 `  Chains: ${selectedChains.join(", ")}`,
                 `  Consumer principal: ${principal}`,
+                "",
+                "No MCP restart is required for wallet changes.",
             ].join("\n"));
         }
         if (defaultCh === "solana") {
@@ -345,6 +359,8 @@ export function registerWalletTools(server) {
                     `  Name: ${walletName}`,
                     `  Chains: solana`,
                     `  Consumer principal: ${principal}`,
+                    "",
+                    "No MCP restart is required for wallet changes.",
                 ].join("\n") + owsNudge);
             }
             catch (err) {
@@ -376,6 +392,8 @@ export function registerWalletTools(server) {
                 `  Name: ${walletName}`,
                 `  Chains: ${selectedChains.join(", ")}`,
                 `  Consumer principal: ${principal}`,
+                "",
+                "No MCP restart is required for wallet changes.",
             ].join("\n") + owsNudge);
         }
         catch {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agentwonderland/mcp",
-  "version": "0.1.41",
+  "version": "0.1.43",
   "type": "module",
   "description": "MCP server for the Agent Wonderland AI agent marketplace",
   "bin": {
@@ -23,6 +23,7 @@
   },
   "dependencies": {
     "@modelcontextprotocol/sdk": "^1.12.1",
+    "@scure/bip39": "^1.6.0",
     "@solana/spl-token": "^0.4.14",
     "@solana/web3.js": "1.95.8",
     "qrcode": "^1.5.4",

package/src/core/__tests__/api-client.test.ts

@@ -72,7 +72,7 @@ describe("api-client headers", () => {
           "X-AW-Rebate-Principal":
             "did:pkh:eip155:8453:0xbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb",
           "X-AW-Surface": "mcp",
-          "X-AW-MCP-Version": "0.1.41",
+          "X-AW-MCP-Version": "0.1.43",
           "X-AW-MCP-Tool": "run_agent",
           "X-AW-MCP-Action": "execute",
         }),

package/src/core/__tests__/setup.test.ts

@@ -30,7 +30,7 @@ describe("MCP setup", () => {
     expect(next.mcpServers.existing.command).toBe("node");
     expect(next.mcpServers.agentwonderland).toEqual({
       command: "npx",
-      args: ["-y", "@agentwonderland/mcp"],
+      args: ["-y", "@agentwonderland/mcp@latest"],
     });
   });
 
@@ -52,7 +52,7 @@ describe("MCP setup", () => {
     expect(next).toContain("[mcp_servers.other]");
     expect(next).toContain("[mcp_servers.agentwonderland]");
     expect(next).toContain('command = "npx"');
-    expect(next).toContain('args = ["-y", "@agentwonderland/mcp"]');
+    expect(next).toContain('args = ["-y", "@agentwonderland/mcp@latest"]');
     expect(next).not.toContain('command = "old"');
     expect(next).toContain("[model_provider.openai]");
   });
@@ -76,7 +76,7 @@ describe("MCP setup", () => {
 
     expect(result.status).toBe("updated");
     expect(result.backupPath).toBeTruthy();
-    expect(written.mcpServers.agentwonderland.args).toEqual(["-y", "@agentwonderland/mcp"]);
+    expect(written.mcpServers.agentwonderland.args).toEqual(["-y", "@agentwonderland/mcp@latest"]);
   });
 
   it("parses client selection flags", () => {

package/src/core/api-client.ts

@@ -7,6 +7,7 @@ import {
   getConsumerPrincipal,
   getConsumerPrincipalForMethod,
 } from "./principal.js";
+import { MCP_PACKAGE_VERSION } from "./version.js";
 
 // ── Error class ────────────────────────────────────────────────────
 
@@ -29,8 +30,6 @@ interface RequestOptions {
   extraHeaders?: Record<string, string>;
 }
 
-const MCP_VERSION = "0.1.41";
-
 function inferToolHeaders(path: string, method: string): Record<string, string> {
   if (path === "/solve") {
     return { "X-AW-MCP-Tool": "solve", "X-AW-MCP-Action": method === "POST" ? "execute" : "view" };
@@ -55,7 +54,7 @@ async function buildHeaders(path: string, method: string, options?: RequestOptio
     "Content-Type": "application/json",
     Accept: "application/json",
     "X-AW-Surface": "mcp",
-    "X-AW-MCP-Version": MCP_VERSION,
+    "X-AW-MCP-Version": MCP_PACKAGE_VERSION,
     ...inferToolHeaders(path, method),
   };
 

package/src/core/ows-adapter.ts

@@ -11,6 +11,9 @@
 import type { LocalAccount } from "viem/accounts";
 import type { Hex } from "viem";
 import type { Keypair } from "@solana/web3.js";
+import { createHmac } from "node:crypto";
+import { mnemonicToSeedSync, validateMnemonic } from "@scure/bip39";
+import { wordlist } from "@scure/bip39/wordlists/english";
 
 // Note: OWS provides encrypted key storage at rest (~/.ows/, AES-256-GCM).
 // For EVM signing, we export the secp256k1 key and use viem's native
@@ -155,6 +158,56 @@ function keypairFromEd25519Hex(privateKeyHex: string, KeypairCtor: typeof import
   throw new Error(`Unsupported ed25519 key length: ${bytes.length} bytes.`);
 }
 
+function parseExportedSecret(exported: string): { secp256k1?: string; ed25519?: string; mnemonic?: string } {
+  const secret = exported.trim();
+  try {
+    const parsed = JSON.parse(secret) as { secp256k1?: string; ed25519?: string; mnemonic?: string };
+    if (parsed.secp256k1 || parsed.ed25519 || parsed.mnemonic) return parsed;
+  } catch {
+    // OWS-created wallets export a BIP-39 mnemonic, not a JSON key object.
+  }
+
+  const hex = secret.startsWith("0x") ? secret.slice(2) : secret;
+  if (/^[0-9a-fA-F]+$/.test(hex)) {
+    if (hex.length === 64) return { secp256k1: hex, ed25519: hex };
+    if (hex.length === 128) return { ed25519: hex };
+  }
+
+  if (validateMnemonic(secret, wordlist)) {
+    return { mnemonic: secret };
+  }
+
+  return {};
+}
+
+function deriveSolanaSeedFromMnemonic(mnemonic: string, path = "m/44'/501'/0'/0'"): Uint8Array {
+  const seed = mnemonicToSeedSync(mnemonic);
+  let digest = createHmac("sha512", "ed25519 seed").update(seed).digest();
+  let key = digest.subarray(0, 32);
+  let chainCode = digest.subarray(32);
+
+  for (const part of path.split("/").slice(1)) {
+    if (!part.endsWith("'")) {
+      throw new Error(`Unsupported non-hardened ed25519 path segment: ${part}`);
+    }
+    const index = Number(part.slice(0, -1));
+    if (!Number.isInteger(index) || index < 0) {
+      throw new Error(`Unsupported ed25519 path segment: ${part}`);
+    }
+
+    const data = Buffer.alloc(37);
+    data[0] = 0;
+    Buffer.from(key).copy(data, 1);
+    data.writeUInt32BE(index + 0x80000000, 33);
+
+    digest = createHmac("sha512", chainCode).update(data).digest();
+    key = digest.subarray(0, 32);
+    chainCode = digest.subarray(32);
+  }
+
+  return Uint8Array.from(key);
+}
+
 // ── Public API ───────────────────────────────────────────────────
 
 /**
@@ -278,7 +331,13 @@ export async function owsAccountFromWalletId(
   // (EIP-5806 delegate calls) which OWS's native signing can't serialize.
   // OWS provides encrypted storage at rest; viem handles signing in memory.
   const exported = ows.exportWallet(walletId);
-  const keys = JSON.parse(exported) as { secp256k1?: string; ed25519?: string };
+  const keys = parseExportedSecret(exported);
+
+  if (keys.mnemonic) {
+    const { mnemonicToAccount } = await import("viem/accounts");
+    return mnemonicToAccount(keys.mnemonic);
+  }
+
   if (!keys.secp256k1) {
     throw new Error(`Wallet "${wallet.name}" has no secp256k1 key for EVM signing.`);
   }
@@ -295,12 +354,17 @@ export async function owsSolanaKeypairFromWalletId(
   findSolanaAccount(wallet);
 
   const exported = ows.exportWallet(walletId);
-  const keys = JSON.parse(exported) as { secp256k1?: string; ed25519?: string };
+  const keys = parseExportedSecret(exported);
+  const { Keypair } = await import("@solana/web3.js");
+
+  if (keys.mnemonic) {
+    return Keypair.fromSeed(deriveSolanaSeedFromMnemonic(keys.mnemonic));
+  }
+
   if (!keys.ed25519) {
     throw new Error(`Wallet "${wallet.name}" has no ed25519 key for Solana signing.`);
   }
 
-  const { Keypair } = await import("@solana/web3.js");
   return keypairFromEd25519Hex(keys.ed25519, Keypair);
 }
 

package/src/core/payments.ts

@@ -76,52 +76,44 @@ async function initEvmMppForChain(
   wallet: WalletEntry,
   chain: "tempo" | "base",
 ): Promise<typeof fetch | null> {
-  try {
-    const { Mppx } = await import("./mpp-client.js");
-    let account;
-
-    if (wallet.keyType === "ows" && wallet.owsWalletId) {
-      const { owsAccountFromWalletId } = await import("./ows-adapter.js");
-      account = await owsAccountFromWalletId(wallet.owsWalletId);
-    } else if (wallet.key) {
-      const { privateKeyToAccount } = await import("viem/accounts");
-      account = privateKeyToAccount(normalizeKey(wallet.key));
-    } else {
-      return null;
-    }
-
-    const methods = [];
-    if (chain === "tempo") {
-      const { tempoChargeClient } = await import("./tempo-charge.js");
-      methods.push(tempoChargeClient({ account }));
-    } else {
-      const { baseChargeClient } = await import("./base-charge.js");
-      methods.push(baseChargeClient({ account }));
-    }
+  const { Mppx } = await import("./mpp-client.js");
+  let account;
 
-    const mppx = Mppx.create({ methods: methods as any, polyfill: false });
-    return mppx.fetch.bind(mppx) as typeof fetch;
-  } catch {
+  if (wallet.keyType === "ows" && wallet.owsWalletId) {
+    const { owsAccountFromWalletId } = await import("./ows-adapter.js");
+    account = await owsAccountFromWalletId(wallet.owsWalletId);
+  } else if (wallet.key) {
+    const { privateKeyToAccount } = await import("viem/accounts");
+    account = privateKeyToAccount(normalizeKey(wallet.key));
+  } else {
     return null;
   }
+
+  const methods = [];
+  if (chain === "tempo") {
+    const { tempoChargeClient } = await import("./tempo-charge.js");
+    methods.push(tempoChargeClient({ account }));
+  } else {
+    const { baseChargeClient } = await import("./base-charge.js");
+    methods.push(baseChargeClient({ account }));
+  }
+
+  const mppx = Mppx.create({ methods: methods as any, polyfill: false });
+  return mppx.fetch.bind(mppx) as typeof fetch;
 }
 
 async function initSolanaMpp(wallet: WalletEntry): Promise<typeof fetch | null> {
-  try {
-    if (wallet.keyType !== "ows" && !wallet.key) {
-      return null;
-    }
-
-    const { Mppx } = await import("./mpp-client.js");
-    const { solanaChargeClient } = await import("./solana-charge.js");
-    const mppx = Mppx.create({
-      methods: [solanaChargeClient({ wallet })] as any,
-      polyfill: false,
-    });
-    return mppx.fetch.bind(mppx) as typeof fetch;
-  } catch {
+  if (wallet.keyType !== "ows" && !wallet.key) {
     return null;
   }
+
+  const { Mppx } = await import("./mpp-client.js");
+  const { solanaChargeClient } = await import("./solana-charge.js");
+  const mppx = Mppx.create({
+    methods: [solanaChargeClient({ wallet })] as any,
+    polyfill: false,
+  });
+  return mppx.fetch.bind(mppx) as typeof fetch;
 }
 
 async function initCard(): Promise<typeof fetch | null> {
@@ -178,6 +170,11 @@ async function initForChain(wallet: WalletEntry, chain: string): Promise<typeof
   return null;
 }
 
+function initFailureMessage(method: string, wallet: WalletEntry, chain: string, err: unknown): string {
+  const reason = err instanceof Error ? err.message : String(err);
+  return `Payment method "${method}" is configured as ${chain} on wallet "${wallet.id}", but the signer could not initialize: ${reason}`;
+}
+
 // ── Public API ──────────────────────────────────────────────────
 
 /**
@@ -214,7 +211,12 @@ export async function getPaymentFetch(method?: string): Promise<typeof fetch> {
     }
     const ck = cacheKey(resolved.wallet.id, resolved.chain);
     if (fetchCache.has(ck)) return fetchCache.get(ck)!;
-    const pf = await initForChain(resolved.wallet, resolved.chain);
+    let pf: typeof fetch | null;
+    try {
+      pf = await initForChain(resolved.wallet, resolved.chain);
+    } catch (err) {
+      throw new Error(initFailureMessage(method, resolved.wallet, resolved.chain, err));
+    }
     if (pf) {
       fetchCache.set(ck, pf);
       return pf;
@@ -264,7 +266,17 @@ export async function getPaymentFetch(method?: string): Promise<typeof fetch> {
     }
     const ck = cacheKey(resolved.wallet.id, resolved.chain);
     if (fetchCache.has(ck)) return fetchCache.get(ck)!;
-    const pf = await initForChain(resolved.wallet, resolved.chain);
+    let pf: typeof fetch | null;
+    try {
+      pf = await initForChain(resolved.wallet, resolved.chain);
+    } catch (err) {
+      if (m === defaultMethod) {
+        const others = configured.filter((x) => x !== m);
+        const altText = others.length > 0 ? ` Alternatives: ${others.join(", ")}` : "";
+        throw new Error(`${initFailureMessage(m, resolved.wallet, resolved.chain, err)}.${altText}`);
+      }
+      continue;
+    }
     if (pf) {
       fetchCache.set(ck, pf);
       return pf;

package/src/core/version.ts

@@ -0,0 +1 @@
+export const MCP_PACKAGE_VERSION = "0.1.43";

package/src/index.ts

@@ -26,8 +26,7 @@ import { registerJobResources } from "./resources/jobs.js";
 // ── Prompts ──────────────────────────────────────────────────────
 import { registerPrompts } from "./prompts/index.js";
 import { runSetupCli } from "./setup.js";
-
-const PACKAGE_VERSION = "0.1.41";
+import { MCP_PACKAGE_VERSION } from "./core/version.js";
 
 export async function startMcpServer(): Promise<void> {
   const server = new McpServer(
@@ -131,7 +130,7 @@ if (isCli) {
       "in a terminal it waits silently for MCP JSON-RPC messages on stdin.",
       "",
       "MCP client config:",
-      '  { "mcpServers": { "agentwonderland": { "command": "npx", "args": ["-y", "@agentwonderland/mcp"] } } }',
+      '  { "mcpServers": { "agentwonderland": { "command": "npx", "args": ["-y", "@agentwonderland/mcp@latest"] } } }',
       "",
       "Options:",
       "  -h, --help     Show this help",
@@ -139,7 +138,7 @@ if (isCli) {
     ].join("\n"));
     process.exit(0);
   } else if (args.includes("--version") || args.includes("-v")) {
-    console.log(PACKAGE_VERSION);
+    console.log(MCP_PACKAGE_VERSION);
     process.exit(0);
   } else {
     if (process.stdin.isTTY && process.stdout.isTTY) {

package/src/setup.ts

@@ -9,7 +9,7 @@ import { execFileSync } from "node:child_process";
 export const SERVER_NAME = "agentwonderland";
 export const SERVER_CONFIG = {
   command: "npx",
-  args: ["-y", "@agentwonderland/mcp"],
+  args: ["-y", "@agentwonderland/mcp@latest"],
 };
 
 export type SetupClientId =
@@ -330,7 +330,7 @@ export function mergeCodexTomlConfig(existing: string): string {
   const block = [
     `[mcp_servers.${SERVER_NAME}]`,
     `command = "npx"`,
-    `args = ["-y", "@agentwonderland/mcp"]`,
+    `args = ["-y", "@agentwonderland/mcp@latest"]`,
     "",
   ].join("\n");
 

package/src/tools/wallet.ts

@@ -28,6 +28,7 @@ import {
   platformSupportsOws,
 } from "../core/ows-adapter.js";
 import { ensureConsumerPrincipal, getConsumerPrincipal } from "../core/principal.js";
+import { MCP_PACKAGE_VERSION } from "../core/version.js";
 
 function text(t: string) {
   return { content: [{ type: "text" as const, text: t }] };
@@ -53,7 +54,10 @@ export function registerWalletTools(server: McpServer): void {
 
       const settings = await getSettings();
       const networkLabel = settings ? ` (${settings.network})` : "";
-      const lines = [`Payment methods${networkLabel}:`];
+      const lines = [
+        `Agent Wonderland MCP: ${MCP_PACKAGE_VERSION}`,
+        `Payment methods${networkLabel}:`,
+      ];
 
       for (const w of wallets) {
         const label = w.label ? ` (${w.label})` : "";
@@ -280,6 +284,8 @@ export function registerWalletTools(server: McpServer): void {
               "",
               chainStatus,
               "",
+              "No MCP restart is required for wallet changes.",
+              "",
               `Fund this address with USDC on ${defaultCh === "solana" ? "Solana" : "Tempo"} to start using agents.`,
             ].join("\n"));
           }
@@ -313,6 +319,8 @@ export function registerWalletTools(server: McpServer): void {
                 `  Chains: solana`,
                 `  Consumer principal: ${principal}`,
                 "",
+                "No MCP restart is required for wallet changes.",
+                "",
                 "Fund this address with USDC on Solana to start using agents.",
               ].join("\n") + owsNudge,
             );
@@ -340,6 +348,8 @@ export function registerWalletTools(server: McpServer): void {
               `  Chains: tempo, base`,
               `  Consumer principal: ${principal}`,
               "",
+              "No MCP restart is required for wallet changes.",
+              "",
               `Fund this address with USDC on Tempo or Base to start using agents.`,
             ].join("\n") + owsNudge,
           );
@@ -369,6 +379,8 @@ export function registerWalletTools(server: McpServer): void {
             `  Storage: ~/.ows/ (AES-256-GCM encrypted)`,
             `  Consumer principal: ${principal}`,
             "",
+            "No MCP restart is required for wallet changes.",
+            "",
             `Fund this address with USDC on ${defaultCh === "solana" ? "Solana" : "Tempo"} to start using agents.`,
             "For testnet: npx mppx account fund",
           ].join("\n"),
@@ -395,11 +407,13 @@ export function registerWalletTools(server: McpServer): void {
             `Key imported to OWS [encrypted]:`,
             `  ID: ${result.walletId}`,
             `  Address: ${result.address}`,
-            `  Name: ${walletName}`,
-            `  Chains: ${selectedChains.join(", ")}`,
-            `  Consumer principal: ${principal}`,
-          ].join("\n"),
-        );
+          `  Name: ${walletName}`,
+          `  Chains: ${selectedChains.join(", ")}`,
+          `  Consumer principal: ${principal}`,
+          "",
+          "No MCP restart is required for wallet changes.",
+        ].join("\n"),
+      );
       }
 
       if (defaultCh === "solana") {
@@ -429,6 +443,8 @@ export function registerWalletTools(server: McpServer): void {
               `  Name: ${walletName}`,
               `  Chains: solana`,
               `  Consumer principal: ${principal}`,
+              "",
+              "No MCP restart is required for wallet changes.",
             ].join("\n") + owsNudge,
           );
         } catch (err) {
@@ -468,6 +484,8 @@ export function registerWalletTools(server: McpServer): void {
             `  Name: ${walletName}`,
             `  Chains: ${selectedChains.join(", ")}`,
             `  Consumer principal: ${principal}`,
+            "",
+            "No MCP restart is required for wallet changes.",
           ].join("\n") + owsNudge,
         );
       } catch {