@aifinpay/mcp 1.5.3 → 2.0.0-rc.13

package/dist/identity.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"identity.d.ts","sourceRoot":"","sources":["../src/identity.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAE7C,MAAM,MAAM,cAAc,GAAG;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAcvF,gFAAgF;AAChF,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,SAAS,GAAG,cAAc,GAAG,IAAI,CA0C3E"}

package/dist/identity.js

@@ -0,0 +1,75 @@
+import { readFileSync, existsSync, statSync } from "node:fs";
+import { resolve, join } from "node:path";
+import { homedir } from "node:os";
+import { scryptSync, createDecipheriv } from "node:crypto";
+function seed(value) {
+    if (typeof value !== "string" || !/^(0x)?[0-9a-fA-F]{64}$/.test(value)) {
+        throw new Error("SEED_HASH must contain a 32-byte hex seed (64 hex characters); no mnemonic or double hashing");
+    }
+    return value.replace(/^0x/, "");
+}
+function readJson(path) {
+    try {
+        return JSON.parse(readFileSync(path, "utf8"));
+    }
+    catch {
+        throw new Error(`Cannot read wallet JSON at ${path}; refusing to generate a replacement wallet`);
+    }
+}
+/** Local inputs only. Never put the returned secrets in an MCP response/log. */
+export function loadWalletIdentity(config) {
+    if (config.seedHash !== undefined)
+        return { source: "SEED_HASH", seedHash: seed(config.seedHash) };
+    const path = resolve(config.agentsFile || "./aifinpay/agents.json");
+    if (existsSync(path)) {
+        const document = readJson(path);
+        const agents = document?.agents;
+        if (!Array.isArray(agents) || agents.length === 0)
+            throw new Error("agents.json requires a non-empty agents array");
+        const matches = config.agentId
+            ? agents.filter((a) => a?.id === config.agentId)
+            : agents;
+        if (matches.length !== 1)
+            throw new Error("Select exactly one agents.json record with AIFINPAY_AGENT_ID; refusing an ambiguous wallet");
+        return { source: "agents.json", seedHash: seed(matches[0]?.seed_hash) };
+    }
+    if (config.agentsFile)
+        throw new Error("Configured AIFINPAY_AGENTS_FILE does not exist");
+    if (config.agentSecretB58)
+        return { source: "AIFINPAY_AGENT_SECRET", secretB58: config.agentSecretB58 };
+    const legacyPath = join(config.walletHome || join(homedir(), ".aifinpay"), "agent.json");
+    if (!existsSync(legacyPath))
+        return null;
+    const legacy = readJson(legacyPath);
+    try {
+        const mode = statSync(legacyPath).mode & 0o777;
+        if (mode & 0o077) {
+            const message = `[aifinpay-mcp] ${legacyPath} is mode ${mode.toString(8)} — readable beyond your user. Run: chmod 600 ${legacyPath}`;
+            if (config.logFn)
+                config.logFn("warn", message);
+            else
+                process.stderr.write(`[warn] ${message}\n`);
+        }
+    }
+    catch { /* A stat failure does not change which wallet was selected. */ }
+    if (legacy.enc) {
+        if (legacy.enc !== "scrypt-aes-256-gcm" || !config.walletPassphrase) {
+            throw new Error("Encrypted keystore requires AIFINPAY_WALLET_PASSPHRASE and the supported encryption format");
+        }
+        try {
+            const key = scryptSync(config.walletPassphrase, Buffer.from(legacy.salt, "base64"), 32, { N: 1 << 15, r: 8, p: 1, maxmem: 64 * 1024 * 1024 });
+            const decipher = createDecipheriv("aes-256-gcm", key, Buffer.from(legacy.iv, "base64"));
+            decipher.setAuthTag(Buffer.from(legacy.tag, "base64"));
+            return { source: "legacy-keystore", secretB58: Buffer.concat([
+                    decipher.update(Buffer.from(legacy.ct, "base64")), decipher.final(),
+                ]).toString("utf8") };
+        }
+        catch {
+            throw new Error("Cannot decrypt keystore; refusing to generate a replacement wallet");
+        }
+    }
+    if (typeof legacy.secretB58 !== "string" || !legacy.secretB58)
+        throw new Error("Invalid legacy keystore");
+    return { source: "legacy-keystore", secretB58: legacy.secretB58 };
+}
+//# sourceMappingURL=identity.js.map

package/dist/identity.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"identity.js","sourceRoot":"","sources":["../src/identity.ts"],"names":[],"mappings":"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"}

package/dist/index.d.ts

@@ -2,12 +2,9 @@
  * @aifinpay/mcp — MCP server exposing AiFinPay's autonomous x402 payment
  * loop as agent-callable tools.
  *
- * Tools:
- *   - agent_address()                    — return Solana + EVM addresses to fund
- *   - agent_call(provider, body)         — registry-resolved paid call (Polygon settle)
- *   - payable_fetch(url, opts?)          — raw-URL paid fetch (legacy Solana path)
- *   - agent_quote(url)                   — inspect 402 cost before paying
- *   - pay_with_split / quote_split       — direct B2BSplitter invoice (advanced)
+ * Tools: public addresses, history, quotas, passport resolution, non-signing
+ * settlement invoices, local wallet reload, and opt-in dev batch quoting.
+ * Signing tools are not registered in this RC.
  *
  * Quick start (stdio transport for Claude Desktop / MCP-aware runtimes):
  *

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,YAAY,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC/C,YAAY,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AACH,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,YAAY,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC/C,YAAY,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC"}

package/dist/index.js

@@ -2,12 +2,9 @@
  * @aifinpay/mcp — MCP server exposing AiFinPay's autonomous x402 payment
  * loop as agent-callable tools.
  *
- * Tools:
- *   - agent_address()                    — return Solana + EVM addresses to fund
- *   - agent_call(provider, body)         — registry-resolved paid call (Polygon settle)
- *   - payable_fetch(url, opts?)          — raw-URL paid fetch (legacy Solana path)
- *   - agent_quote(url)                   — inspect 402 cost before paying
- *   - pay_with_split / quote_split       — direct B2BSplitter invoice (advanced)
+ * Tools: public addresses, history, quotas, passport resolution, non-signing
+ * settlement invoices, local wallet reload, and opt-in dev batch quoting.
+ * Signing tools are not registered in this RC.
  *
  * Quick start (stdio transport for Claude Desktop / MCP-aware runtimes):
  *

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAG3C,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AACH,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAG3C,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC"}

package/dist/safe-fetch.d.ts

@@ -12,6 +12,7 @@ export declare class BlockedRequestError extends Error {
  */
 export declare function assertRequestAllowed(rawUrl: string, opts?: {
     allowPrivate?: boolean;
+    trustedHosts?: string[];
 }): Promise<URL>;
 /**
  * A `fetch` that validates the target, and every redirect target, before going.
@@ -21,5 +22,6 @@ export declare function assertRequestAllowed(rawUrl: string, opts?: {
  */
 export declare function makeSafeFetch(opts?: {
     allowPrivate?: boolean;
+    trustedHosts?: string[];
 }): typeof fetch;
 //# sourceMappingURL=safe-fetch.d.ts.map

package/dist/safe-fetch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"safe-fetch.d.ts","sourceRoot":"","sources":["../src/safe-fetch.ts"],"names":[],"mappings":"AA4DA,oDAAoD;AACpD,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAmBtD;AAED,qBAAa,mBAAoB,SAAQ,KAAK;CAAG;AAEjD;;;;;;;GAOG;AACH,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,MAAM,EACd,IAAI,GAAE;IAAE,YAAY,CAAC,EAAE,OAAO,CAAA;CAAO,GACpC,OAAO,CAAC,GAAG,CAAC,CAkDd;AAED;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,IAAI,GAAE;IAAE,YAAY,CAAC,EAAE,OAAO,CAAA;CAAO,GAAG,OAAO,KAAK,CA4BjF"}
+{"version":3,"file":"safe-fetch.d.ts","sourceRoot":"","sources":["../src/safe-fetch.ts"],"names":[],"mappings":"AA4DA,oDAAoD;AACpD,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CA0BtD;AAED,qBAAa,mBAAoB,SAAQ,KAAK;CAAG;AAEjD;;;;;;;GAOG;AACH,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,MAAM,EACd,IAAI,GAAE;IAAE,YAAY,CAAC,EAAE,OAAO,CAAC;IAAC,YAAY,CAAC,EAAE,MAAM,EAAE,CAAA;CAAO,GAC7D,OAAO,CAAC,GAAG,CAAC,CAyEd;AAED;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,IAAI,GAAE;IAAE,YAAY,CAAC,EAAE,OAAO,CAAC;IAAC,YAAY,CAAC,EAAE,MAAM,EAAE,CAAA;CAAO,GAAG,OAAO,KAAK,CAkD1G"}

package/dist/safe-fetch.js

@@ -65,12 +65,22 @@ export function isBlockedAddress(addr) {
         return BLOCKED_V4.some(([lo, hi]) => n >= lo && n <= hi);
     }
     if (family === 6) {
-        const lower = addr.toLowerCase().replace(/^\[|\]$/g, "");
+        // URL canonicalization collapses expanded zeros AND rewrites mapped dotted
+        // IPv4 into hex, e.g. ::ffff:127.0.0.1 becomes ::ffff:7f00:1.
+        let lower;
+        try {
+            lower = new URL(`https://[${addr}]/`).hostname.replace(/^\[|\]$/g, "");
+        }
+        catch {
+            return true;
+        }
         // An IPv4-mapped address is an IPv4 address wearing a hat. Unwrap it, or
         // ::ffff:127.0.0.1 walks straight through an IPv6-only check.
-        const mapped = lower.match(/^::ffff:(\d+\.\d+\.\d+\.\d+)$/);
-        if (mapped)
-            return isBlockedAddress(mapped[1]);
+        const mapped = lower.match(/^::ffff:([0-9a-f]{1,4}):([0-9a-f]{1,4})$/);
+        if (mapped) {
+            const n = (parseInt(mapped[1], 16) * 65536 + parseInt(mapped[2], 16)) >>> 0;
+            return BLOCKED_V4.some(([lo, hi]) => n >= lo && n <= hi);
+        }
         if (lower === "::1" || lower === "::")
             return true;
         if (/^f[cd][0-9a-f]{2}:/.test(lower))
@@ -116,12 +126,32 @@ export async function assertRequestAllowed(rawUrl, opts = {}) {
         }
         return url;
     }
+    // An operator naming this exact host has vouched for it, so the resolution
+    // step is skipped for it and only for it.
+    //
+    // Why this exists: behind an HTTP proxy the client does not resolve at all —
+    // the proxy does — so lookup() fails with getaddrinfo EAI_AGAIN and every
+    // host is refused as "cannot resolve". That is the guard misfiring on the
+    // environment rather than on a threat, and it made the MCP server unusable in
+    // proxied setups (external E2E, 2026-08-27).
+    //
+    // Deliberately per-host and not a proxy-detection switch. "We seem to be
+    // behind a proxy, disable the SSRF check" turns one environment quirk into a
+    // blanket bypass, which is the shape of the vulnerability this file exists to
+    // prevent. Exact hostnames only — no suffix matching, because "example.com"
+    // trusting "evil-example.com" is the classic way an allowlist stops meaning
+    // anything.
+    if (opts.trustedHosts?.some((h) => h.toLowerCase() === host.toLowerCase())) {
+        return url;
+    }
     let addresses;
     try {
         addresses = await lookup(host, { all: true });
     }
     catch (e) {
-        throw new BlockedRequestError(`cannot resolve ${host}: ${e.message}`);
+        throw new BlockedRequestError(`cannot resolve ${host}: ${e.message}. `
+            + `If this host is reachable only through a proxy, name it in `
+            + `AIFINPAY_TRUSTED_HOSTS to skip the DNS pre-check for it alone.`);
     }
     if (!addresses.length) {
         throw new BlockedRequestError(`${host} resolved to nothing`);
@@ -143,22 +173,51 @@ export async function assertRequestAllowed(rawUrl, opts = {}) {
  */
 export function makeSafeFetch(opts = {}) {
     const safeFetch = async (input, init) => {
-        let target = typeof input === "string" ? input
-            : input instanceof URL ? input.toString()
-                : input.url;
-        let request = init;
+        let request = new Request(input, init);
+        const redirect = request.redirect;
         for (let hop = 0; hop <= MAX_REDIRECTS; hop++) {
-            await assertRequestAllowed(target, opts);
-            const res = await globalThis.fetch(target, { ...request, redirect: "manual" });
-            const location = res.status >= 300 && res.status < 400 ? res.headers.get("location") : null;
+            await assertRequestAllowed(request.url, opts);
+            const res = await globalThis.fetch(request.clone(), { redirect: "manual" });
+            const location = [301, 302, 303, 307, 308].includes(res.status) ? res.headers.get("location") : null;
             if (!location)
                 return res;
-            target = new URL(location, target).toString();
-            // 303, and 301/302 in practice, turn the follow-up into a GET with no
-            // body. Mirroring that keeps behaviour the same as a normal fetch.
-            if (res.status === 303 || res.status === 301 || res.status === 302) {
-                request = { ...request, method: "GET", body: undefined };
+            if (redirect === "manual")
+                return res;
+            await res.body?.cancel();
+            if (redirect === "error")
+                throw new BlockedRequestError("redirect forbidden by request policy");
+            if (hop === MAX_REDIRECTS)
+                break;
+            const next = new URL(location, request.url);
+            const crossOrigin = next.origin !== new URL(request.url).origin;
+            const dropBody = (res.status === 303 && !["GET", "HEAD"].includes(request.method))
+                || ([301, 302].includes(res.status) && request.method === "POST");
+            if (crossOrigin && request.body && !dropBody) {
+                throw new BlockedRequestError("refusing cross-origin redirect with a request body");
+            }
+            const headers = new Headers(request.headers);
+            if (crossOrigin) {
+                // Only explicitly public negotiation headers may leave the original
+                // origin. A denylist cannot anticipate every merchant's secret header.
+                const publicHeaders = new Set(["accept", "accept-language", "cache-control", "pragma"]);
+                for (const key of Array.from(headers.keys()))
+                    if (!publicHeaders.has(key))
+                        headers.delete(key);
+            }
+            if (dropBody) {
+                for (const key of ["content-type", "content-length", "content-encoding", "content-language", "content-location"])
+                    headers.delete(key);
             }
+            const redirectInit = dropBody ? {
+                method: "GET", signal: request.signal, credentials: request.credentials,
+                cache: request.cache, mode: request.mode, redirect, referrer: request.referrer,
+                referrerPolicy: request.referrerPolicy, integrity: request.integrity, keepalive: request.keepalive,
+            } : request;
+            const redirected = new Request(next, redirectInit);
+            request = new Request(redirected, {
+                headers,
+                ...(crossOrigin ? { credentials: "omit", referrer: "", referrerPolicy: "no-referrer" } : {}),
+            });
         }
         throw new BlockedRequestError(`too many redirects (more than ${MAX_REDIRECTS})`);
     };

package/dist/safe-fetch.js.map

@@ -1 +1 @@
-{"version":3,"file":"safe-fetch.js","sourceRoot":"","sources":["../src/safe-fetch.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"safe-fetch.js","sourceRoot":"","sources":["../src/safe-fetch.ts"],"names":[],"mappings":"AAAA,sDAAsD;AACtD,EAAE;AACF,6EAA6E;AAC7E,6EAA6E;AAC7E,wEAAwE;AACxE,8EAA8E;AAC9E,+EAA+E;AAC/E,uEAAuE;AACvE,EAAE;AACF,gFAAgF;AAChF,mEAAmE;AACnE,sEAAsE;AACtE,6EAA6E;AAC7E,4EAA4E;AAC5E,EAAE;AACF,6EAA6E;AAC7E,gFAAgF;AAChF,uDAAuD;AAEvD,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAC3C,OAAO,EAAE,IAAI,EAAE,MAAM,UAAU,CAAC;AAEhC,qDAAqD;AACrD,MAAM,aAAa,GAAG,CAAC,CAAC;AAExB;;;;;;;;GAQG;AACH,MAAM,UAAU,GAAuB;IACrC,CAAC,UAAU,EAAE,UAAU,CAAC,EAAE,YAAY;IACtC,CAAC,UAAU,EAAE,UAAU,CAAC,EAAE,aAAa;IACvC,CAAC,UAAU,EAAE,UAAU,CAAC,EAAE,4BAA4B;IACtD,CAAC,UAAU,EAAE,UAAU,CAAC,EAAE,uBAAuB;IACjD,CAAC,UAAU,EAAE,UAAU,CAAC,EAAE,uCAAuC;IACjE,CAAC,UAAU,EAAE,UAAU,CAAC,EAAE,gBAAgB;IAC1C,CAAC,UAAU,EAAE,UAAU,CAAC,EAAE,eAAe;IACzC,CAAC,UAAU,EAAE,UAAU,CAAC,EAAE,iBAAiB;IAC3C,CAAC,UAAU,EAAE,UAAU,CAAC,EAAE,6BAA6B;IACvD,CAAC,UAAU,EAAE,UAAU,CAAC,EAAE,wBAAwB;IAClD,CAAC,UAAU,EAAE,UAAU,CAAC,EAAE,mCAAmC;CAC9D,CAAC;AAEF,SAAS,OAAO,CAAC,EAAU;IACzB,MAAM,KAAK,GAAG,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC5B,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IACpC,IAAI,CAAC,GAAG,CAAC,CAAC;IACV,KAAK,MAAM,CAAC,IAAI,KAAK,EAAE,CAAC;QACtB,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;QACpB,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,GAAG;YAAE,OAAO,IAAI,CAAC;QAC1D,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;IACnB,CAAC;IACD,OAAO,CAAC,KAAK,CAAC,CAAC;AACjB,CAAC;AAED,oDAAoD;AACpD,MAAM,UAAU,gBAAgB,CAAC,IAAY;IAC3C,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC;IAC1B,IAAI,MAAM,KAAK,CAAC,EAAE,CAAC;QACjB,MAAM,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;QACxB,IAAI,CAAC,KAAK,IAAI;YAAE,OAAO,IAAI,CAAC,CAAC,4CAA4C;QACzE,OAAO,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;IAC3D,CAAC;IACD,IAAI,MAAM,KAAK,CAAC,EAAE,CAAC;QACjB,2EAA2E;QAC3E,8DAA8D;QAC9D,IAAI,KAAa,CAAC;QAClB,IAAI,CAAC;YAAC,KAAK,GAAG,IAAI,GAAG,CAAC,YAAY,IAAI,IAAI,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;QAAC,CAAC;QAC/E,MAAM,CAAC;YAAC,OAAO,IAAI,CAAC;QAAC,CAAC;QACtB,yEAAyE;QACzE,8DAA8D;QAC9D,MAAM,MAAM,GAAG,KAAK,CAAC,KAAK,CAAC,0CAA0C,CAAC,CAAC;QACvE,IAAI,MAAM,EAAE,CAAC;YACX,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,KAAK,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC;YAC5E,OAAO,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;QAC3D,CAAC;QACD,IAAI,KAAK,KAAK,KAAK,IAAI,KAAK,KAAK,IAAI;YAAE,OAAO,IAAI,CAAC;QACnD,IAAI,oBAAoB,CAAC,IAAI,CAAC,KAAK,CAAC;YAAE,OAAO,IAAI,CAAC,CAAC,wBAAwB;QAC3E,IAAI,oBAAoB,CAAC,IAAI,CAAC,KAAK,CAAC;YAAE,OAAO,IAAI,CAAC,CAAC,uBAAuB;QAC1E,OAAO,KAAK,CAAC;IACf,CAAC;IACD,OAAO,IAAI,CAAC,CAAC,wBAAwB;AACvC,CAAC;AAED,MAAM,OAAO,mBAAoB,SAAQ,KAAK;CAAG;AAEjD;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACxC,MAAc,EACd,OAA4D,EAAE;IAE9D,IAAI,GAAQ,CAAC;IACb,IAAI,CAAC;QACH,GAAG,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,CAAC;IACxB,CAAC;IAAC,MAAM,CAAC;QACP,MAAM,IAAI,mBAAmB,CAAC,oBAAoB,MAAM,EAAE,CAAC,CAAC;IAC9D,CAAC;IAED,IAAI,IAAI,CAAC,YAAY;QAAE,OAAO,GAAG,CAAC,CAAC,wCAAwC;IAE3E,IAAI,GAAG,CAAC,QAAQ,KAAK,QAAQ,IAAI,GAAG,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;QAC1D,MAAM,IAAI,mBAAmB,CAC3B,YAAY,GAAG,CAAC,QAAQ,qDAAqD,CAC9E,CAAC;IACJ,CAAC;IACD,IAAI,GAAG,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;QAC7B,2EAA2E;QAC3E,6CAA6C;QAC7C,MAAM,IAAI,mBAAmB,CAC3B,mBAAmB,GAAG,CAAC,IAAI,mCAAmC,CAC/D,CAAC;IACJ,CAAC;IAED,MAAM,IAAI,GAAG,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;IAClD,IAAI,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;QACf,IAAI,gBAAgB,CAAC,IAAI,CAAC,EAAE,CAAC;YAC3B,MAAM,IAAI,mBAAmB,CAAC,YAAY,IAAI,wBAAwB,CAAC,CAAC;QAC1E,CAAC;QACD,OAAO,GAAG,CAAC;IACb,CAAC;IAED,2EAA2E;IAC3E,0CAA0C;IAC1C,EAAE;IACF,6EAA6E;IAC7E,0EAA0E;IAC1E,0EAA0E;IAC1E,8EAA8E;IAC9E,6CAA6C;IAC7C,EAAE;IACF,yEAAyE;IACzE,6EAA6E;IAC7E,8EAA8E;IAC9E,4EAA4E;IAC5E,4EAA4E;IAC5E,YAAY;IACZ,IAAI,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,KAAK,IAAI,CAAC,WAAW,EAAE,CAAC,EAAE,CAAC;QAC3E,OAAO,GAAG,CAAC;IACb,CAAC;IAED,IAAI,SAAgC,CAAC;IACrC,IAAI,CAAC;QACH,SAAS,GAAG,MAAM,MAAM,CAAC,IAAI,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC;IAChD,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,MAAM,IAAI,mBAAmB,CAC3B,kBAAkB,IAAI,KAAM,CAAW,CAAC,OAAO,IAAI;cACjD,6DAA6D;cAC7D,gEAAgE,CACnE,CAAC;IACJ,CAAC;IACD,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC;QACtB,MAAM,IAAI,mBAAmB,CAAC,GAAG,IAAI,sBAAsB,CAAC,CAAC;IAC/D,CAAC;IACD,2EAA2E;IAC3E,mDAAmD;IACnD,KAAK,MAAM,EAAE,OAAO,EAAE,IAAI,SAAS,EAAE,CAAC;QACpC,IAAI,gBAAgB,CAAC,OAAO,CAAC,EAAE,CAAC;YAC9B,MAAM,IAAI,mBAAmB,CAC3B,YAAY,IAAI,oBAAoB,OAAO,iCAAiC,CAC7E,CAAC;QACJ,CAAC;IACH,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,aAAa,CAAC,OAA4D,EAAE;IAC1F,MAAM,SAAS,GAAG,KAAK,EACrB,KAAkC,EAClC,IAAkC,EACf,EAAE;QACrB,IAAI,OAAO,GAAG,IAAI,OAAO,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QACvC,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;QAElC,KAAK,IAAI,GAAG,GAAG,CAAC,EAAE,GAAG,IAAI,aAAa,EAAE,GAAG,EAAE,EAAE,CAAC;YAC9C,MAAM,oBAAoB,CAAC,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;YAC9C,MAAM,GAAG,GAAG,MAAM,UAAU,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAC;YAE5E,MAAM,QAAQ,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;YACrG,IAAI,CAAC,QAAQ;gBAAE,OAAO,GAAG,CAAC;YAC1B,IAAI,QAAQ,KAAK,QAAQ;gBAAE,OAAO,GAAG,CAAC;YACtC,MAAM,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC;YACzB,IAAI,QAAQ,KAAK,OAAO;gBAAE,MAAM,IAAI,mBAAmB,CAAC,sCAAsC,CAAC,CAAC;YAChG,IAAI,GAAG,KAAK,aAAa;gBAAE,MAAM;YAEjC,MAAM,IAAI,GAAG,IAAI,GAAG,CAAC,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC;YAC5C,MAAM,WAAW,GAAG,IAAI,CAAC,MAAM,KAAK,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC;YAChE,MAAM,QAAQ,GAAG,CAAC,GAAG,CAAC,MAAM,KAAK,GAAG,IAAI,CAAC,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;mBAC7E,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,OAAO,CAAC,MAAM,KAAK,MAAM,CAAC,CAAC;YACpE,IAAI,WAAW,IAAI,OAAO,CAAC,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;gBAC7C,MAAM,IAAI,mBAAmB,CAAC,oDAAoD,CAAC,CAAC;YACtF,CAAC;YACD,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;YAC7C,IAAI,WAAW,EAAE,CAAC;gBAChB,oEAAoE;gBACpE,uEAAuE;gBACvE,MAAM,aAAa,GAAG,IAAI,GAAG,CAAC,CAAC,QAAQ,EAAE,iBAAiB,EAAE,eAAe,EAAE,QAAQ,CAAC,CAAC,CAAC;gBACxF,KAAK,MAAM,GAAG,IAAI,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;oBAAE,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC;wBAAE,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YACjG,CAAC;YACD,IAAI,QAAQ,EAAE,CAAC;gBACb,KAAK,MAAM,GAAG,IAAI,CAAC,cAAc,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,kBAAkB,CAAC;oBAAE,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YACxI,CAAC;YACD,MAAM,YAAY,GAAG,QAAQ,CAAC,CAAC,CAAC;gBAC9B,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,WAAW,EAAE,OAAO,CAAC,WAAW;gBACvE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,CAAC,QAAQ;gBAC9E,cAAc,EAAE,OAAO,CAAC,cAAc,EAAE,SAAS,EAAE,OAAO,CAAC,SAAS,EAAE,SAAS,EAAE,OAAO,CAAC,SAAS;aACnG,CAAC,CAAC,CAAC,OAAO,CAAC;YACZ,MAAM,UAAU,GAAG,IAAI,OAAO,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;YACnD,OAAO,GAAG,IAAI,OAAO,CAAC,UAAU,EAAE;gBAChC,OAAO;gBACP,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE,EAAE,cAAc,EAAE,aAAa,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aAC7F,CAAC,CAAC;QACL,CAAC;QACD,MAAM,IAAI,mBAAmB,CAAC,iCAAiC,aAAa,GAAG,CAAC,CAAC;IACnF,CAAC,CAAC;IACF,OAAO,SAAyB,CAAC;AACnC,CAAC"}

package/dist/server.d.ts

@@ -2,15 +2,18 @@ import { AiFinPayAgent } from "@aifinpay/agent";
 import { Server } from "@modelcontextprotocol/sdk/server/index.js";
 import type { McpConfig } from "./config.js";
 /**
- * Build an MCP server that wraps the AiFinPay agent SDK as MCP tools.
+ * Production-RC MCP surface.
  *
- * Returned server is unstarted — caller wires up a transport (stdio, SSE,
- * etc.) via the official `@modelcontextprotocol/sdk` package.
+ * IMPORTANT: the old agent_call, payable_fetch, pay_with_split, quote_split,
+ * agent_claim_self and agent_quote tools are deliberately NOT registered.
+ * They depend on @aifinpay/agent 1.x legacy splitter/x402 semantics and must not
+ * be available to a model after the 0% AIFP-2 / gross-inclusive AIFP-1 change.
  *
- * As of 0.1.0-alpha.3 the wrapped identity is `AiFinPayAgent` — dual-chain
- * (Solana base58 pubkey AND Polygon EVM address from one secret). Tools
- * that previously called legacy `Agent` methods now reach them via
- * `agent.inner.*`.
+ * This server remains useful before the SDK 2.0 package is published: it can
+ * expose the wallet address, resolve Agent Passport identity, read verified
+ * v1.3 routes, and construct a non-signing settlement invoice. Signing/moving
+ * value returns only after MCP depends on the published v2 executor and its E2E
+ * release gate has passed.
  */
 export declare function createServer(config?: McpConfig): Promise<{
     server: Server<{
@@ -47,7 +50,7 @@ export declare function createServer(config?: McpConfig): Promise<{
             } | undefined;
         } | undefined;
     }>;
-    agent: AiFinPayAgent;
+    readonly agent: AiFinPayAgent;
 }>;
 export interface ToolContext {
     agent: AiFinPayAgent;

package/dist/server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAS,MAAM,iBAAiB,CAAC;AACvD,OAAO,EAAE,MAAM,EAAE,MAAM,2CAA2C,CAAC;AAKnE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AA4B7C;;;;;;;;;;GAUG;AACH,wBAAsB,YAAY,CAAC,MAAM,GAAE,SAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiHxD;AAED,MAAM,WAAW,WAAW;IAC1B,KAAK,EAAE,aAAa,CAAC;IACrB,MAAM,EAAE,SAAS,CAAC;IAClB,GAAG,EAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;CAC9D"}
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,MAAM,EAAE,MAAM,2CAA2C,CAAC;AAQnE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AA2B7C;;;;;;;;;;;;;GAaG;AACH,wBAAsB,YAAY,CAAC,MAAM,GAAE,SAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+GxD;AAED,MAAM,WAAW,WAAW;IAC1B,KAAK,EAAE,aAAa,CAAC;IACrB,MAAM,EAAE,SAAS,CAAC;IAClB,GAAG,EAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;CAC9D"}

package/dist/server.js

@@ -1,139 +1,143 @@
 import { AiFinPayAgent } from "@aifinpay/agent";
 import { Server } from "@modelcontextprotocol/sdk/server/index.js";
-import { CallToolRequestSchema, ListToolsRequestSchema, } from "@modelcontextprotocol/sdk/types.js";
-import { payableFetchTool, runPayableFetch } from "./tools/payable-fetch.js";
+import { CallToolRequestSchema, ListToolsRequestSchema, ListResourcesRequestSchema, ReadResourceRequestSchema, } from "@modelcontextprotocol/sdk/types.js";
+import { readFileSync } from "node:fs";
+import { loadWalletIdentity } from "./identity.js";
+import { agentHistoryTool, runAgentHistory } from "./tools/agent-history.js";
+import { devPaymentQuoteTool, runDevPaymentQuote } from "./tools/dev-payment-quote.js";
 import { agentAddressTool, runAgentAddress } from "./tools/agent-address.js";
-import { agentQuoteTool, runAgentQuote } from "./tools/agent-quote.js";
-import { agentCallTool, runAgentCall } from "./tools/agent-call.js";
-import { agentClaimSelfTool, runAgentClaimSelf } from "./tools/agent-claim-self.js";
+import { agentQuotaTool, runAgentQuota } from "./tools/agent-quota.js";
 import { makeSafeFetch } from "./safe-fetch.js";
-import { payWithSplitTool, runPayWithSplit, quoteSplitTool, runQuoteSplit, } from "./tools/pay-with-split.js";
-// Every request the agent makes goes through this, including redirects.
-//
-// payable_fetch hands a caller-supplied URL to the agent, which requests it
-// and, on a 402, pays and requests it again. Nothing checked the URL, so a
-// caller — or a prompt injection reaching the tool — could name
-// http://127.0.0.1:4001 or http://169.254.169.254/latest/meta-data/ and read
-// the answer. It is the tool exposed over HTTP today.
-//
-// Set AIFINPAY_ALLOW_PRIVATE_FETCH=1 to lift it, which is what a local bridge
-// on localhost needs and what a public deployment must never have.
+import { loadConfigFromEnv } from "./config.js";
+import { agentPassportResolveTool, runAgentPassportResolve, settlementRoutesTool, runSettlementRoutes, settlementInvoiceTool, runSettlementInvoice, } from "./tools/production-control.js";
+// Every backend/public request made by this server goes through safeFetch.
+// Public deployments never lift private-network protection; local development
+// may explicitly use AIFINPAY_ALLOW_PRIVATE_FETCH=1.
 const safeFetch = makeSafeFetch({
     allowPrivate: process.env.AIFINPAY_ALLOW_PRIVATE_FETCH === "1",
+    // Exact hosts an operator vouches for. Skips only the DNS pre-check, and only
+    // for those names — see safe-fetch.ts for why this is not a proxy switch.
+    trustedHosts: loadConfigFromEnv().trustedHosts,
 });
 /**
- * Build an MCP server that wraps the AiFinPay agent SDK as MCP tools.
+ * Production-RC MCP surface.
  *
- * Returned server is unstarted — caller wires up a transport (stdio, SSE,
- * etc.) via the official `@modelcontextprotocol/sdk` package.
+ * IMPORTANT: the old agent_call, payable_fetch, pay_with_split, quote_split,
+ * agent_claim_self and agent_quote tools are deliberately NOT registered.
+ * They depend on @aifinpay/agent 1.x legacy splitter/x402 semantics and must not
+ * be available to a model after the 0% AIFP-2 / gross-inclusive AIFP-1 change.
  *
- * As of 0.1.0-alpha.3 the wrapped identity is `AiFinPayAgent` — dual-chain
- * (Solana base58 pubkey AND Polygon EVM address from one secret). Tools
- * that previously called legacy `Agent` methods now reach them via
- * `agent.inner.*`.
+ * This server remains useful before the SDK 2.0 package is published: it can
+ * expose the wallet address, resolve Agent Passport identity, read verified
+ * v1.3 routes, and construct a non-signing settlement invoice. Signing/moving
+ * value returns only after MCP depends on the published v2 executor and its E2E
+ * release gate has passed.
  */
 export async function createServer(config = {}) {
     const log = config.logFn ?? defaultLog;
-    // Agent identity: load from env secret if provided, else generate one
-    // and print to stderr so the human knows what to fund.
-    const agent = config.agentSecretB58
-        ? await AiFinPayAgent.fromSolanaSecret(config.agentSecretB58, {
-            fetchImpl: safeFetch,
-            baseUrl: config.baseUrl,
-            timeoutMs: config.timeoutMs,
-        })
-        : await (async () => {
-            const a = await AiFinPayAgent.new({
-                fetchImpl: safeFetch,
-                baseUrl: config.baseUrl,
-                timeoutMs: config.timeoutMs,
-            });
-            // NEVER log private key material. stderr is captured by Docker,
-            // journald, CI logs, support bundles and monitoring, so printing the
-            // secret here leaked it into all of them.
-            //
-            // The warning below stays, but not for the reason it once gave. That
-            // reason — that new() produced an EVM key independent of the Solana
-            // one, so no backup could restore both — was fixed: everything now
-            // derives from a single random seed. What makes this identity
-            // ephemeral is narrower and still true: the seed is never printed and
-            // never written anywhere, deliberately, because stderr ends up in
-            // Docker, journald, CI logs and support bundles. Recoverable in
-            // principle, unrecoverable in practice, so still not an address to
-            // fund.
-            log("warn", `[aifinpay-mcp] no AIFINPAY_AGENT_SECRET set — generated an EPHEMERAL, NON-RECOVERABLE agent.\n` +
-                `  solana_address: ${a.solanaAddress}\n` +
-                `  evm_address:    ${a.evmAddress}\n` +
-                `  >> DO NOT FUND these addresses. This identity is lost when the process exits.\n` +
-                `  >> For a persistent wallet, create one from a seed you back up\n` +
-                `     (AiFinPayAgent.fromSeed / \`aifinpay init\`) and set AIFINPAY_AGENT_SECRET.`);
-            return a;
-        })();
-    // AIFINPAY_MAX_USD is the documented "hard cap on a single payment".
-    // payable_fetch enforces it via PayOptions, but agent_call settles through
-    // AiFinPayAgent.call() which only honours the agent's budget caps — wire
-    // the cap there too, otherwise the primary tool has NO runaway protection.
+    let identitySource = "ephemeral";
+    async function configuredAgent() {
+        const identity = loadWalletIdentity(config);
+        if (!identity)
+            return null;
+        const options = { fetchImpl: safeFetch, baseUrl: config.baseUrl, timeoutMs: config.timeoutMs };
+        const loaded = identity.seedHash
+            ? await AiFinPayAgent.fromSeed(identity.seedHash, options)
+            : await AiFinPayAgent.fromSolanaSecret(identity.secretB58, options);
+        return { loaded, source: identity.source };
+    }
+    const configured = await configuredAgent();
+    let agent = configured?.loaded ?? await AiFinPayAgent.new({
+        fetchImpl: safeFetch, baseUrl: config.baseUrl, timeoutMs: config.timeoutMs,
+    });
+    identitySource = configured?.source ?? "ephemeral";
+    if (!configured)
+        log("warn", "[aifinpay-mcp] EPHEMERAL wallet — DO NOT FUND. Run `npx @aifinpay/mcp init`, then agent_reload in this connection.");
+    // Keep the legacy agent budget configured even though this RC exposes no
+    // signing tool. It remains an additional defence for downstream/private code
+    // and for the subsequent v2 MCP executor integration.
     if (config.maxAmountUsd !== undefined && Number.isFinite(config.maxAmountUsd)) {
         agent.setBudget({ per_call_usd: config.maxAmountUsd });
         log("info", `[aifinpay-mcp] per-call cap: $${config.maxAmountUsd} (AIFINPAY_MAX_USD)`);
     }
-    else {
-        log("warn", "[aifinpay-mcp] AIFINPAY_MAX_USD not set — agent_call/payable_fetch have NO per-payment cap. Strongly recommended.");
-    }
-    log("info", `[aifinpay-mcp] solana: ${agent.solanaAddress} · evm: ${agent.evmAddress}`);
+    log("info", `[aifinpay-mcp] production RC safe surface · solana: ${agent.solanaAddress} · evm: ${agent.evmAddress}`);
     const server = new Server({
         name: "@aifinpay/mcp",
-        version: "1.0.0",
-    }, {
-        capabilities: {
-            tools: {},
-        },
-    });
-    server.setRequestHandler(ListToolsRequestSchema, async () => {
-        return {
-            tools: [
-                agentAddressTool(),
-                agentCallTool(),
-                agentClaimSelfTool(),
-                payableFetchTool(),
-                agentQuoteTool(),
-                payWithSplitTool(),
-                quoteSplitTool(),
-            ],
-        };
+        version: JSON.parse(readFileSync(new URL("../package.json", import.meta.url), "utf8")).version,
+    }, { capabilities: { tools: {}, resources: {} } });
+    server.setRequestHandler(ListResourcesRequestSchema, async () => ({ resources: [{
+                uri: "aifinpay://skill", name: "AiFinPay skill", mimeType: "text/markdown",
+                description: "Wallet source priority, payment history routes, reconnect behavior and dev testing limits",
+            }] }));
+    server.setRequestHandler(ReadResourceRequestSchema, async (request) => {
+        if (request.params.uri !== "aifinpay://skill")
+            throw new Error("Unknown resource");
+        return { contents: [{ uri: "aifinpay://skill", mimeType: "text/markdown",
+                    text: readFileSync(new URL("../skills/SKILL.md", import.meta.url), "utf8") }] };
     });
+    server.setRequestHandler(ListToolsRequestSchema, async () => ({
+        tools: [
+            agentAddressTool(),
+            {
+                name: "agent_reload",
+                description: "Reload the configured local wallet files after init or a file update, without starting a new conversation. Returns public addresses only. Shell environment changes still require reconnecting the MCP process.",
+                inputSchema: { type: "object", properties: {}, additionalProperties: false },
+                annotations: { readOnlyHint: false, destructiveHint: false, openWorldHint: false },
+            },
+            agentQuotaTool(),
+            agentHistoryTool(),
+            ...(config.devMode ? [devPaymentQuoteTool()] : []),
+            agentPassportResolveTool(),
+            settlementRoutesTool(),
+            settlementInvoiceTool(),
+        ],
+    }));
     server.setRequestHandler(CallToolRequestSchema, async (request) => {
         const { name, arguments: args } = request.params;
         const ctx = { agent, config, log };
         switch (name) {
+            case "agent_reload":
+                try {
+                    const replacement = await configuredAgent();
+                    if (!replacement)
+                        throw new Error("No persistent wallet configured; run init or configure the project wallet first");
+                    if (config.maxAmountUsd !== undefined && Number.isFinite(config.maxAmountUsd)) {
+                        replacement.loaded.setBudget({ per_call_usd: config.maxAmountUsd });
+                    }
+                    agent = replacement.loaded;
+                    identitySource = replacement.source;
+                    return { content: [{ type: "text", text: JSON.stringify({
+                                    source: identitySource, solana: agent.solanaAddress, evm: agent.evmAddress,
+                                    casper: agent.casperAddress, reloaded: true,
+                                }) }] };
+                }
+                catch (error) {
+                    return { isError: true, content: [{ type: "text", text: `Wallet reload failed: ${error.message}` }] };
+                }
             case "agent_address":
                 return runAgentAddress(ctx, args ?? {});
-            case "agent_call":
-                return runAgentCall(ctx, args ?? {});
-            case "agent_claim_self":
-                return runAgentClaimSelf(ctx, args ?? {});
-            case "payable_fetch":
-                return runPayableFetch(ctx, args ?? {});
-            case "agent_quote":
-                return runAgentQuote(ctx, args ?? {});
-            case "pay_with_split":
-                return runPayWithSplit(ctx, args ?? {});
-            case "quote_split":
-                return runQuoteSplit(ctx, args ?? {});
+            case "agent_quota":
+                return runAgentQuota(ctx, args ?? {});
+            case "agent_history":
+                return runAgentHistory(ctx, args ?? {});
+            case "dev_payment_quote":
+                return runDevPaymentQuote(ctx, args ?? {});
+            case "agent_passport_resolve":
+                return runAgentPassportResolve(ctx, args ?? {});
+            case "settlement_routes":
+                return runSettlementRoutes(ctx, args ?? {});
+            case "settlement_invoice":
+                return runSettlementInvoice(ctx, args ?? {});
             default:
                 return {
                     isError: true,
-                    content: [
-                        { type: "text", text: `unknown tool: ${name}` },
-                    ],
+                    content: [{ type: "text", text: `unknown or retired tool: ${name}` }],
                 };
         }
     });
-    return { server, agent };
+    return { server, get agent() { return agent; } };
 }
 function defaultLog(level, msg) {
-    // MCP stdio servers MUST NOT write to stdout — the transport owns it.
-    // stderr is safe.
     process.stderr.write(`[${level}] ${msg}\n`);
 }
 //# sourceMappingURL=server.js.map