bsv-mcp 0.2.0 → 0.2.7

package/index.ts

@@ -1,14 +1,38 @@
 #!/usr/bin/env bun
+
+// Redirect console.log/warn/info/debug to stderr in stdio mode.
+// MCP stdio transport uses stdout exclusively for JSON-RPC messages —
+// any stray stdout output corrupts the protocol. Must run before any import.
+const _isStdio =
+	process.argv.includes("--stdio") ||
+	process.env.TRANSPORT?.toLowerCase() === "stdio";
+if (_isStdio) {
+	const _err = console.error.bind(console);
+	console.log = (...a: unknown[]) => _err("[log]", ...a);
+	console.warn = (...a: unknown[]) => _err("[warn]", ...a);
+	console.info = (...a: unknown[]) => _err("[info]", ...a);
+	console.debug = (...a: unknown[]) => _err("[debug]", ...a);
+}
+
+import { readFile } from "node:fs/promises";
 import os from "node:os";
 import path from "node:path";
+import { dirname, join } from "node:path";
+import { fileURLToPath } from "node:url";
 import { PrivateKey } from "@bsv/sdk";
+import {
+	RESOURCE_MIME_TYPE,
+	registerAppResource,
+	registerAppTool,
+} from "@modelcontextprotocol/ext-apps/server";
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
+import { z } from "zod";
 import packageJson from "./package.json";
 import { registerAllPrompts } from "./prompts/index.ts";
 import { registerResources } from "./resources/resources.ts";
+import { getBsvPriceWithCache } from "./tools/bsv/getPrice.ts";
 import { registerAllTools, type ToolsConfig } from "./tools/index.ts";
-import { registerMneeTools } from "./tools/mnee/index.ts";
 import { IntegratedWallet } from "./tools/wallet/integratedWallet.ts";
 import { Wallet } from "./tools/wallet/wallet.ts";
 import { BunSSEServerTransport } from "./transports/sse.ts";
@@ -41,13 +65,14 @@ const CONFIG = {
 	loadA2bTools: process.env.ENABLE_A2B_TOOLS === "true",
 	loadBapTools: process.env.DISABLE_BAP_TOOLS !== "true",
 	loadBsocialTools: process.env.DISABLE_BSOCIAL_TOOLS !== "true",
-	loadBigBlocksTools: process.env.DISABLE_BIGBLOCKS_TOOLS !== "true",
-
 	// Transaction broadcasting control
 	disableBroadcasting: process.env.DISABLE_BROADCASTING === "true",
 
 	// --- Transport Mode ---
-	transportMode: process.env.TRANSPORT?.toLowerCase() || "http", // 'stdio' or 'http'/default
+	// --stdio CLI flag takes precedence over TRANSPORT env var (matches neighborhood plugin pattern)
+	transportMode: process.argv.includes("--stdio")
+		? "stdio"
+		: (process.env.TRANSPORT?.toLowerCase() || "http"), // 'stdio' or 'http'/default
 	port: Number.parseInt(process.env.PORT || "3000", 10),
 
 	// --- Droplet API Configuration ---
@@ -209,6 +234,378 @@ async function initializeKeys(): Promise<{
 	return { payPk, identityPk: undefined, xprv: undefined, source: "generated" };
 }
 
+// --- MCP App Tools & Resource ---
+const APP_RESOURCE_URI = "ui://bsv-mcp/app.html";
+const __appDirname = dirname(fileURLToPath(import.meta.url));
+
+function registerMcpAppTools(server: McpServer, wallet?: Wallet) {
+	// Primary dashboard tool — model calls this to open the UI
+	registerAppTool(
+		server,
+		"bsv_dashboard",
+		{
+			title: "BSV Dashboard",
+			description:
+				"Interactive BSV dashboard with Explorer, Wallet, and Ordinals tabs. Use this for any BSV-related query that benefits from visual display.",
+			inputSchema: {},
+			_meta: {
+				ui: { resourceUri: APP_RESOURCE_URI },
+			},
+		},
+		async () => {
+			return {
+				content: [{ type: "text" as const, text: "BSV Dashboard opened" }],
+				structuredContent: { view: "dashboard", ready: true },
+			};
+		},
+	);
+
+	// App-only: fetch explorer data (price, chain info, tx decode, address lookup)
+	registerAppTool(
+		server,
+		"app_explorer_data",
+		{
+			title: "Explorer Data",
+			description:
+				"App-only: fetches BSV price, chain info, decodes transactions, and looks up addresses.",
+			inputSchema: {
+				txid: z.string().optional().describe("Transaction ID to decode"),
+				address: z
+					.string()
+					.optional()
+					.describe("Address to look up balance/history"),
+			},
+			_meta: {
+				ui: { resourceUri: APP_RESOURCE_URI, visibility: ["app"] },
+			},
+		},
+		async (args) => {
+			const { txid, address } = args as {
+				txid?: string;
+				address?: string;
+			};
+
+			// If txid provided, decode transaction
+			if (txid) {
+				try {
+					const res = await fetch(
+						`https://junglebus.gorillapool.io/v1/transaction/get/${txid}`,
+					);
+					if (!res.ok)
+						throw new Error(`Transaction not found: ${res.status}`);
+					const jbData = (await res.json()) as Record<string, unknown>;
+
+					const { Transaction, Utils } = await import("@bsv/sdk");
+					const rawTx = jbData.transaction as string;
+					const isBase64 = /^[A-Za-z0-9+/=]+$/.test(rawTx);
+					const txBytes = isBase64
+						? Utils.toArray(rawTx, "base64")
+						: Utils.toArray(rawTx, "hex");
+					const tx = Transaction.fromBinary(txBytes);
+
+					return {
+						content: [
+							{ type: "text" as const, text: `Decoded transaction ${txid}` },
+						],
+						structuredContent: {
+							transaction: {
+								txid,
+								version: tx.version,
+								lockTime: tx.lockTime,
+								size: tx.toBinary().length,
+								inputs: tx.inputs.map((inp) => ({
+									txid: inp.sourceTXID,
+									vout: inp.sourceOutputIndex,
+									script: inp.unlockingScript?.toHex() || "",
+								})),
+								outputs: tx.outputs.map((out, i) => ({
+									n: i,
+									value: out.satoshis,
+									scriptPubKey: {
+										hex: out.lockingScript.toHex(),
+										asm: out.lockingScript.toASM(),
+									},
+								})),
+								confirmations: jbData.block_height ? 1 : 0,
+								block: jbData.block_hash
+									? {
+											hash: jbData.block_hash,
+											height: jbData.block_height,
+										}
+									: null,
+							},
+						},
+					};
+				} catch (err) {
+					return {
+						content: [
+							{
+								type: "text" as const,
+								text: `Error: ${err instanceof Error ? err.message : String(err)}`,
+							},
+						],
+						structuredContent: { error: String(err) },
+					};
+				}
+			}
+
+			// If address provided, look up balance and history
+			if (address) {
+				try {
+					const [balRes, histRes] = await Promise.all([
+						fetch(
+							`https://api.whatsonchain.com/v1/bsv/main/address/${address}/balance`,
+						),
+						fetch(
+							`https://api.whatsonchain.com/v1/bsv/main/address/${address}/history`,
+						),
+					]);
+					const balance = balRes.ok
+						? ((await balRes.json()) as Record<string, unknown>)
+						: null;
+					const history = histRes.ok
+						? ((await histRes.json()) as Array<Record<string, unknown>>)
+						: [];
+
+					return {
+						content: [
+							{ type: "text" as const, text: `Address info for ${address}` },
+						],
+						structuredContent: {
+							addressInfo: { balance, history },
+						},
+					};
+				} catch (err) {
+					return {
+						content: [
+							{
+								type: "text" as const,
+								text: `Error: ${err instanceof Error ? err.message : String(err)}`,
+							},
+						],
+						structuredContent: { error: String(err) },
+					};
+				}
+			}
+
+			// Default: return price + chain info
+			try {
+				const [price, chainRes] = await Promise.all([
+					getBsvPriceWithCache(),
+					fetch("https://api.whatsonchain.com/v1/bsv/main/chain/info"),
+				]);
+				const chainInfo = chainRes.ok
+					? ((await chainRes.json()) as Record<string, unknown>)
+					: null;
+
+				return {
+					content: [
+						{
+							type: "text" as const,
+							text: `BSV price: $${price.toFixed(2)}`,
+						},
+					],
+					structuredContent: { price, chainInfo },
+				};
+			} catch (err) {
+				return {
+					content: [
+						{
+							type: "text" as const,
+							text: `Error: ${err instanceof Error ? err.message : String(err)}`,
+						},
+					],
+					structuredContent: { error: String(err) },
+				};
+			}
+		},
+	);
+
+	// App-only: fetch wallet data
+	registerAppTool(
+		server,
+		"app_wallet_data",
+		{
+			title: "Wallet Data",
+			description: "App-only: fetches wallet balance, UTXOs, and address.",
+			inputSchema: {},
+			_meta: {
+				ui: { resourceUri: APP_RESOURCE_URI, visibility: ["app"] },
+			},
+		},
+		async () => {
+			if (!wallet) {
+				return {
+					content: [
+						{
+							type: "text" as const,
+							text: "No wallet configured",
+						},
+					],
+					structuredContent: {
+						error: "No wallet configured. Set PRIVATE_KEY_WIF or generate keys.",
+					},
+				};
+			}
+
+			try {
+				const { paymentUtxos } = await wallet.getUtxos();
+				const address = wallet.getAddress();
+				let totalSatoshis = 0;
+				for (const utxo of paymentUtxos) {
+					totalSatoshis += utxo.satoshis || 0;
+				}
+
+				let price: number | undefined;
+				try {
+					price = await getBsvPriceWithCache();
+				} catch {
+					/* price fetch optional */
+				}
+
+				const { toBitcoin } = await import("satoshi-token");
+				const bsvAmount = toBitcoin(totalSatoshis);
+
+				return {
+					content: [
+						{
+							type: "text" as const,
+							text: `Wallet balance: ${bsvAmount} BSV`,
+						},
+					],
+					structuredContent: {
+						balance: {
+							satoshis: totalSatoshis,
+							bsv: bsvAmount,
+							utxoCount: paymentUtxos.length,
+						},
+						address,
+						utxos: paymentUtxos.slice(0, 50).map((u) => ({
+							txid: u.txid,
+							vout: u.vout,
+							satoshis: u.satoshis,
+						})),
+						price,
+					},
+				};
+			} catch (err) {
+				return {
+					content: [
+						{
+							type: "text" as const,
+							text: `Error: ${err instanceof Error ? err.message : String(err)}`,
+						},
+					],
+					structuredContent: { error: String(err) },
+				};
+			}
+		},
+	);
+
+	// App-only: fetch ordinals data
+	registerAppTool(
+		server,
+		"app_ordinals_data",
+		{
+			title: "Ordinals Data",
+			description:
+				"App-only: fetches ordinals/NFT marketplace listings and search results.",
+			inputSchema: {
+				query: z.string().optional().describe("Search query"),
+			},
+			_meta: {
+				ui: { resourceUri: APP_RESOURCE_URI, visibility: ["app"] },
+			},
+		},
+		async (args) => {
+			const { query } = args as { query?: string };
+
+			try {
+				if (query) {
+					// Search inscriptions
+					const url = new URL(
+						"https://ordinals.gorillapool.io/api/inscriptions/search",
+					);
+					url.searchParams.set("limit", "20");
+					url.searchParams.set("offset", "0");
+					url.searchParams.set("dir", "desc");
+					url.searchParams.set("terms", query);
+
+					const res = await fetch(url.toString());
+					if (!res.ok) throw new Error(`Search failed: ${res.status}`);
+					const data = (await res.json()) as Record<string, unknown>;
+
+					return {
+						content: [
+							{
+								type: "text" as const,
+								text: `Found results for "${query}"`,
+							},
+						],
+						structuredContent: {
+							results: data.results || [],
+							total: data.total || 0,
+						},
+					};
+				}
+
+				// Default: fetch marketplace listings
+				const res = await fetch(
+					"https://ordinals.gorillapool.io/api/market?limit=20&offset=0&sort=recent&dir=desc",
+				);
+				if (!res.ok) throw new Error(`Market fetch failed: ${res.status}`);
+				const data = (await res.json()) as Record<string, unknown>;
+
+				return {
+					content: [
+						{ type: "text" as const, text: "Marketplace listings loaded" },
+					],
+					structuredContent: {
+						listings: data.results || [],
+						total: data.total || 0,
+					},
+				};
+			} catch (err) {
+				return {
+					content: [
+						{
+							type: "text" as const,
+							text: `Error: ${err instanceof Error ? err.message : String(err)}`,
+						},
+					],
+					structuredContent: { error: String(err) },
+				};
+			}
+		},
+	);
+
+	// Register the HTML resource
+	registerAppResource(
+		server,
+		"BSV Dashboard",
+		APP_RESOURCE_URI,
+		{ description: "Interactive BSV dashboard with Explorer, Wallet, and Ordinals tabs" },
+		async () => {
+			const distPath = join(__appDirname, "dist", "app.html");
+			let html: string;
+			try {
+				html = await readFile(distPath, "utf-8");
+			} catch {
+				html = "<html><body><p>Dashboard not built. Run <code>bun run build:view</code> to enable it.</p></body></html>";
+			}
+			return {
+				contents: [
+					{
+						uri: APP_RESOURCE_URI,
+						mimeType: RESOURCE_MIME_TYPE,
+						text: html,
+					},
+				],
+			};
+		},
+	);
+}
+
 // --- Main Server Setup ---
 async function main() {
 	// Check for help or info commands that don't need authentication
@@ -234,7 +631,6 @@ Environment Variables:
   DISABLE_UTILS_TOOLS    Disable utility tools (default: false)
   DISABLE_BAP_TOOLS      Disable BAP tools (default: false)  
   DISABLE_BSOCIAL_TOOLS  Disable BSocial tools (default: false)
-  DISABLE_BIGBLOCKS_TOOLS Disable BigBlocks tools (default: false)
   ENABLE_A2B_TOOLS       Enable A2B tools (default: false)
   DISABLE_BROADCASTING   Disable transaction broadcasting (default: false)
   USE_DROPLET_API        Use Droplet API for transactions (default: false)
@@ -246,7 +642,6 @@ Tool Categories:
   Utils Tools:    General utilities, conversions
   BAP Tools:      Identity management (requires identity key)
   BSocial Tools:  Social posts, likes, follows
-  BigBlocks Tools: React component registry, code generation, examples
   A2B Tools:      Advanced BSV operations (requires identity key)
 
 Authentication:
@@ -328,9 +723,6 @@ Authentication:
 	logFunc(
 		`  DISABLE_BAP_TOOLS:    ${process.env.DISABLE_BAP_TOOLS === "true" ? "Set (true)" : "Not Set/false"}`,
 	);
-	logFunc(
-		`  DISABLE_BIGBLOCKS_TOOLS: ${process.env.DISABLE_BIGBLOCKS_TOOLS === "true" ? "Set (true)" : "Not Set/false"}`,
-	);
 	logFunc(
 		`  DISABLE_BROADCASTING: ${process.env.DISABLE_BROADCASTING === "true" ? "Set (true)" : "Not Set/false"}`,
 	);
@@ -417,10 +809,6 @@ Authentication:
 		logFunc(
 			`    BSocial:      ${effectiveConfig.loadBsocialTools ? "\x1b[32mEnabled\x1b[0m" : "\x1b[31mDisabled\x1b[0m"}`,
 		);
-		logFunc(
-			`    BigBlocks:    ${effectiveConfig.loadBigBlocksTools ? "\x1b[32mEnabled\x1b[0m" : "\x1b[31mDisabled\x1b[0m"}`,
-		);
-
 		if (effectiveConfig.loadWalletTools) {
 			logFunc(
 				`      Broadcasting: ${!effectiveConfig.disableBroadcasting ? "\x1b[32mEnabled\x1b[0m" : "\x1b[31mDisabled\x1b[0m"}`,
@@ -437,6 +825,9 @@ Authentication:
 				prompts: {},
 				resources: {},
 				tools: {},
+				experimental: {
+					"io.modelcontextprotocol/ui": { version: "0.1" },
+				},
 			},
 			instructions: `
 				This server exposes Bitcoin SV helpers.
@@ -528,14 +919,8 @@ Authentication:
 				}
 			}
 
-			// Register MNEE tools if enabled and wallet is available
-			if (effectiveConfig.loadMneeTools && wallet) {
-				registerMneeTools(server);
-			} else if (
-				effectiveConfig.loadMneeTools &&
-				!wallet &&
-				CONFIG.loadWalletTools
-			) {
+			// Disable MNEE tools if wallet is not available
+			if (effectiveConfig.loadMneeTools && !wallet && CONFIG.loadWalletTools) {
 				logFunc(
 					"\x1b[33mWARN: MNEE tools require a wallet but wallet initialization failed. MNEE tools disabled.\x1b[0m",
 				);
@@ -551,7 +936,6 @@ Authentication:
 			enableA2bTools: effectiveConfig.loadA2bTools,
 			enableBapTools: effectiveConfig.loadBapTools,
 			enableBsocialTools: effectiveConfig.loadBsocialTools,
-			enableBigBlocksTools: effectiveConfig.loadBigBlocksTools,
 			enableWalletTools: effectiveConfig.loadWalletTools,
 			enableMneeTools: effectiveConfig.loadMneeTools,
 			identityPk,
@@ -565,6 +949,9 @@ Authentication:
 		registerAllTools(server, toolsConfig);
 	}
 
+	// Register MCP App tools and resource (interactive UI)
+	registerMcpAppTools(server, wallet);
+
 	// Register prompts if enabled
 	if (CONFIG.loadPrompts) {
 		registerAllPrompts(server);

package/package.json

@@ -2,7 +2,7 @@
 	"name": "bsv-mcp",
 	"module": "dist/index.js",
 	"type": "module",
-	"version": "0.2.0",
+	"version": "0.2.7",
 	"license": "MIT",
 	"author": "satchmo",
 	"description": "A collection of Bitcoin SV (BSV) tools for the Model Context Protocol (MCP) framework",
@@ -42,58 +42,62 @@
 	"private": false,
 	"devDependencies": {
 		"@biomejs/biome": "^2.4.6",
+		"@radix-ui/react-dialog": "^1.1.15",
+		"@radix-ui/react-dropdown-menu": "^2.1.16",
+		"@radix-ui/react-label": "^2.1.8",
+		"@radix-ui/react-separator": "^1.1.8",
+		"@radix-ui/react-slot": "^1.2.4",
+		"@radix-ui/react-tabs": "^1.1.13",
+		"@radix-ui/react-toast": "^1.2.15",
+		"@radix-ui/react-tooltip": "^1.2.8",
+		"@radix-ui/themes": "^3.3.0",
 		"@tailwindcss/postcss": "^4.2.1",
+		"@tanstack/react-query": "^5.90.21",
 		"@types/bun": "^1.3.10",
 		"@types/node": "^25.3.5",
-		"bun": "^1.3.10",
 		"@types/react": "^19.2.14",
 		"@types/react-dom": "^19.2.3",
 		"autoprefixer": "^10.4.27",
+		"bun": "^1.3.10",
+		"class-variance-authority": "^0.7.1",
+		"clsx": "^2.1.1",
+		"lucide-react": "0.577.0",
+		"next": "^16.1.6",
+		"next-themes": "^0.4.6",
 		"postcss": "^8.5.8",
+		"react": "^19.2.4",
+		"react-dom": "^19.2.4",
+		"sonner": "^2.0.7",
+		"tailwind-merge": "^3.5.0",
 		"tailwindcss": "^4.2.1",
-		"tailwindcss-animate": "^1.0.7"
+		"tailwindcss-animate": "^1.0.7",
+		"vite": "^7.3.1",
+		"vite-plugin-singlefile": "^2.3.0"
 	},
 	"peerDependencies": {
 		"typescript": "^5.9.3"
 	},
 	"dependencies": {
 		"@bsv/sdk": "^2.0.6",
+		"@modelcontextprotocol/ext-apps": "^1.2.0",
 		"@modelcontextprotocol/sdk": "^1.27.1",
-		"@radix-ui/react-dialog": "^1.1.15",
-		"@radix-ui/react-dropdown-menu": "^2.1.16",
-		"@radix-ui/react-label": "^2.1.8",
-		"@radix-ui/react-separator": "^1.1.8",
-		"@radix-ui/react-slot": "^1.2.4",
-		"@radix-ui/react-tabs": "^1.1.13",
-		"@radix-ui/react-toast": "^1.2.15",
-		"@radix-ui/react-tooltip": "^1.2.8",
-		"@radix-ui/themes": "^3.3.0",
-		"@tanstack/react-query": "^5.90.21",
-		"bigblocks": "0.0.39",
 		"bitcoin-auth": "^0.0.7",
 		"bitcoin-backup": "0.0.7",
 		"bmap-api-types": "0.0.9",
 		"bsv-bap": "0.1.23",
-		"class-variance-authority": "^0.7.1",
-		"clsx": "^2.1.1",
 		"jose": "^6.2.0",
 		"js-1sat-ord": "^0.1.91",
-		"lucide-react": "0.577.0",
 		"mcp-handler": "^1.0.7",
 		"mnee": "^3.1.0",
-		"next": "^16.1.6",
-		"next-themes": "^0.4.6",
-		"react": "^19.2.4",
-		"react-dom": "^19.2.4",
 		"satoshi-token": "^0.0.7",
 		"schema-dts": "^1.1.5",
 		"sigma-protocol": "^0.1.9",
-		"sonner": "^2.0.7",
-		"tailwind-merge": "^3.5.0",
 		"zod": "^4.3.6"
 	},
 	"scripts": {
-		"build": "bun build ./index.ts --outdir ./dist --target node",
+		"build": "bun run ./scripts/build.ts",
+		"build:view": "vite build",
+		"build:all": "bun run build:view && bun run build",
 		"dev": "next dev",
 		"build:next": "next build",
 		"start:next": "next start",

package/tools/a2b/discover.ts

@@ -121,37 +121,37 @@ export function registerA2bDiscoverTool(server: McpServer) {
 	server.tool(
 		"a2b_discover",
 		"Search on-chain agent and MCP tool records. Use 'agent' to search for agents, 'tool' to search for MCP tools.",
-		{ args: a2bDiscoverArgsSchema },
+		{ ...a2bDiscoverArgsSchema.shape },
 		async (
-			{ args }: { args: A2bDiscoverArgs },
+			{ queryType, query, limit, offset, fromBlock, toBlock },
 			extra: RequestHandlerExtra<ServerRequest, ServerNotification>,
 		) => {
 			try {
 				const params = new URLSearchParams();
 
 				// Set query type (agent, tool, or all)
-				params.set("type", args.queryType);
+				params.set("type", queryType);
 
 				// Use enhanced search for better relevance scoring
 				let searchEndpoint = "/search/enhanced";
 
 				// For empty queries, use the regular search endpoint
-				if (!args.query || !args.query.trim()) {
+				if (!query || !query.trim()) {
 					searchEndpoint = "/search";
 				} else {
-					params.set("q", args.query); // enhanced search uses 'q' parameter
+					params.set("q", query); // enhanced search uses 'q' parameter
 				}
 
 				// Add pagination parameters
-				params.set("limit", args.limit?.toString() ?? "10");
-				params.set("offset", args.offset?.toString() ?? "0");
+				params.set("limit", limit?.toString() ?? "10");
+				params.set("offset", offset?.toString() ?? "0");
 
 				// Add block range if specified
-				if (args.fromBlock) {
-					params.set("fromBlock", args.fromBlock.toString());
+				if (fromBlock) {
+					params.set("fromBlock", fromBlock.toString());
 				}
-				if (args.toBlock) {
-					params.set("toBlock", args.toBlock.toString());
+				if (toBlock) {
+					params.set("toBlock", toBlock.toString());
 				}
 
 				// Construct the full URL
@@ -178,7 +178,7 @@ export function registerA2bDiscoverTool(server: McpServer) {
 				let result = "";
 
 				if (data?.items?.length > 0) {
-					result = `Found ${data.items.length} ${args.queryType}(s):\n\n`;
+					result = `Found ${data.items.length} ${queryType}(s):\n\n`;
 
 					data.items.forEach((item: A2BDiscoveryItem, index: number) => {
 						// Server name and description
@@ -217,7 +217,7 @@ export function registerA2bDiscoverTool(server: McpServer) {
 						result += "\n";
 					});
 				} else {
-					result = `No ${args.queryType} results found.`;
+					result = `No ${queryType} results found.`;
 				}
 
 				return {

package/tools/bap/friend.ts

@@ -55,12 +55,11 @@ export function registerBapFriendTool(
 	server.tool(
 		"bap_friend",
 		"Initiates a friend request to another BAP ID by broadcasting an on-chain MAP transaction.",
-		{ args: bapFriendArgsSchema },
+		{ ...bapFriendArgsSchema.shape },
 		async (
-			{ args }: { args: BapFriendArgs },
+			{ targetBapId },
 			extra: RequestHandlerExtra<ServerRequest, ServerNotification>,
 		): Promise<CallToolResult> => {
-			const { targetBapId } = args;
 			const logFunc = console.error;
 
 			try {