@oobe-protocol-labs/sap-mcp-server 0.9.1 → 0.9.3

package/dist/tools/sap-sdk-tools.js

@@ -5,18 +5,233 @@
  * `@oobe-protocol-labs/synapse-sap-sdk@1.0.x`. It does not create local
  * facades for missing SDK namespaces and it does not fabricate network data.
  */
-import { PublicKey } from '@solana/web3.js';
+import { PublicKey, SystemProgram, Transaction } from '@solana/web3.js';
 import BN from 'bn.js';
-import { TOOL_CATEGORY_VALUES } from '@oobe-protocol-labs/synapse-sap-sdk';
+import { Pda, TOOL_CATEGORY_VALUES, USDC_MINT_DEVNET, USDC_MINT_MAINNET } from '@oobe-protocol-labs/synapse-sap-sdk';
 import { SettlementMode, TokenType, } from '@oobe-protocol-labs/synapse-sap-sdk/types';
 import { createTextResponse } from '../adapters/mcp/tool-response.js';
 import { registerTool } from '../adapters/mcp/sdk-compat.js';
 import { getSapClient, isSapClientInitialized } from '../sap/sap-client-manager.js';
 import { logger } from '../core/logger.js';
+import { DEFAULT_SAP_PROGRAM_ID, SAP_PROTOCOL_TREASURY, SAP_REGISTRATION_FEE_LAMPORTS, } from '../core/constants.js';
+import { classifyTool } from '../payments/pricing.js';
 const ESCROW_AMOUNT_DESCRIPTION = 'Amount in the escrow token smallest unit: lamports for SOL, micro-USDC for USDC, or base units for the configured SPL token.';
 const ESCROW_V2_COSIGNED_MODE = 1;
 const ESCROW_V2_DISPUTE_WINDOW_MODE = 2;
 const DEFAULT_ESCROW_V2_DISPUTE_WINDOW_SLOTS = new BN(2160);
+const TOKEN_PROGRAM_ID = new PublicKey('TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA');
+const ASSOCIATED_TOKEN_PROGRAM_ID = new PublicKey('ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL');
+export const SAP_AGENT_CAPABILITY_INPUT_SCHEMA = {
+    oneOf: [
+        {
+            type: 'string',
+            description: 'Capability id shorthand, for example jupiter:swap, pyth:price, metaplex:identity, sns:identity, or risk:management.',
+        },
+        {
+            type: 'object',
+            properties: {
+                id: {
+                    type: 'string',
+                    description: 'Required stable capability id. Use protocol:action naming, for example jupiter:swap, pyth:price, metaplex:identity, sns:identity, x402:payments, or risk:management.',
+                },
+                description: {
+                    type: 'string',
+                    description: 'Optional human-readable capability description for agents and explorers.',
+                },
+                protocolId: {
+                    type: 'string',
+                    description: 'Optional protocol namespace backing this capability, for example sap, mcp, jupiter, pyth, metaplex, sns, x402, or custom.',
+                },
+                version: {
+                    type: 'string',
+                    description: 'Optional capability version string. Use semver when the capability maps to an API contract.',
+                },
+            },
+            required: ['id'],
+            additionalProperties: false,
+        },
+    ],
+};
+export const SAP_AGENT_PRICING_TIER_INPUT_SCHEMA = {
+    type: 'object',
+    properties: {
+        tierId: {
+            type: 'string',
+            description: 'Stable tier id, for example default, read, premium, value-action, or enterprise.',
+        },
+        pricePerCall: {
+            type: 'string',
+            description: 'Price per call in the smallest unit of tokenType: lamports for sol, micro-USDC for usdc, or base units for spl.',
+        },
+        minPricePerCall: {
+            type: 'string',
+            description: 'Optional floor price per call in the smallest unit of tokenType.',
+        },
+        maxPricePerCall: {
+            type: 'string',
+            description: 'Optional ceiling price per call in the smallest unit of tokenType.',
+        },
+        rateLimit: {
+            type: 'number',
+            description: 'Maximum calls per second allowed by this tier. Defaults to 60.',
+        },
+        maxCallsPerSession: {
+            type: 'number',
+            description: 'Maximum calls allowed per session for this tier. Defaults to 1000.',
+        },
+        burstLimit: {
+            type: 'number',
+            description: 'Optional short-window burst allowance for this tier.',
+        },
+        tokenType: {
+            type: 'string',
+            enum: ['sol', 'usdc', 'spl'],
+            description: 'Payment token type. Use usdc for x402/pay.sh agent commerce. Use spl only with tokenMint.',
+        },
+        tokenMint: {
+            type: 'string',
+            description: 'Optional SPL token mint public key. Required when tokenType is spl. For mainnet USDC use EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v.',
+        },
+        tokenDecimals: {
+            type: 'number',
+            description: 'Decimals for the payment token. Defaults to 6 for usdc and 9 for sol when omitted.',
+        },
+        settlementMode: {
+            type: 'string',
+            enum: ['instant', 'escrow', 'batched', 'x402'],
+            description: 'Settlement strategy. Use x402 for HTTP 402/pay.sh flows, escrow for prepaid SAP usage ledgers, instant for direct pay-per-call, and batched for periodic settlement.',
+        },
+        minEscrowDeposit: {
+            type: 'string',
+            description: 'Optional minimum escrow deposit in the smallest unit of tokenType.',
+        },
+        batchIntervalSec: {
+            type: 'number',
+            description: 'Optional settlement batch interval in seconds when settlementMode is batched.',
+        },
+        volumeCurve: {
+            type: 'array',
+            description: 'Optional volume discounts. Each item lowers pricePerCall after a call threshold.',
+            items: {
+                type: 'object',
+                properties: {
+                    afterCalls: { type: 'number', description: 'Call count threshold where this price starts.' },
+                    pricePerCall: { type: 'string', description: 'Discounted price per call in the smallest unit of tokenType.' },
+                },
+                required: ['afterCalls', 'pricePerCall'],
+                additionalProperties: false,
+            },
+        },
+    },
+    required: ['pricePerCall'],
+    additionalProperties: false,
+};
+export const SAP_AGENT_REGISTER_INPUT_SCHEMA = {
+    name: {
+        type: 'string',
+        description: 'Required public display name for the SAP agent. Keep it stable enough for explorers and humans.',
+    },
+    description: {
+        type: 'string',
+        description: 'Required public description of what the agent does, which protocols it can use, and its safety/trust boundaries.',
+    },
+    capabilities: {
+        type: 'array',
+        description: 'Required capability list. Prefer object form for production; strings are accepted as shorthand.',
+        items: SAP_AGENT_CAPABILITY_INPUT_SCHEMA,
+    },
+    pricing: {
+        type: 'array',
+        description: 'Optional pricing tiers advertised by the agent. Use tokenType usdc + settlementMode x402 for pay.sh/x402 agent commerce.',
+        items: SAP_AGENT_PRICING_TIER_INPUT_SCHEMA,
+    },
+    protocols: {
+        type: 'array',
+        items: { type: 'string' },
+        description: 'Required protocol tags the agent supports, for example sap, mcp, jupiter, pyth, metaplex, sns, x402, payments.',
+    },
+    agentId: {
+        type: 'string',
+        description: 'Optional stable lowercase agent id, for example solking. This is separate from the on-chain agent PDA.',
+    },
+    agentUri: {
+        type: 'string',
+        description: 'Optional public HTTPS/IPFS/Arweave/Kommodo URI for the agent profile metadata or profile page. Never use local desktop file paths.',
+    },
+    metadataUri: {
+        type: 'string',
+        description: 'Alias for agentUri. Prefer a public JSON metadata document containing name, description, image, external_url, attributes, sap, metaplex, sns, and x402 fields.',
+    },
+    x402Endpoint: {
+        type: 'string',
+        description: 'Optional public x402 discovery/payment endpoint, usually https://host/.well-known/x402 for external agent services.',
+    },
+};
+export const SAP_AGENT_UPDATE_INPUT_SCHEMA = {
+    name: {
+        type: 'string',
+        description: 'Optional replacement display name. Omit to keep the current name.',
+    },
+    description: {
+        type: 'string',
+        description: 'Optional replacement description. Omit to keep the current description.',
+    },
+    capabilities: {
+        type: 'array',
+        description: 'Optional full replacement capability list. Omit to keep current capabilities; do not send only the new item unless replacing the whole list is intended.',
+        items: SAP_AGENT_CAPABILITY_INPUT_SCHEMA,
+    },
+    pricing: {
+        type: 'array',
+        description: 'Optional full replacement pricing tier list. Omit to keep current pricing.',
+        items: SAP_AGENT_PRICING_TIER_INPUT_SCHEMA,
+    },
+    protocols: {
+        type: 'array',
+        items: { type: 'string' },
+        description: 'Optional full replacement protocol list. Omit to keep current protocols.',
+    },
+    agentId: {
+        type: 'string',
+        description: 'Optional replacement stable agent id. Omit to keep current agentId.',
+    },
+    agentUri: {
+        type: 'string',
+        description: 'Optional replacement public URI for agent metadata/profile. Use this to update pictures after uploading metadata to IPFS, Arweave, Kommodo, or HTTPS.',
+    },
+    metadataUri: {
+        type: 'string',
+        description: 'Alias for agentUri. Use a public metadata JSON URI; never use a desktop file path.',
+    },
+    x402Endpoint: {
+        type: 'string',
+        description: 'Optional replacement x402 discovery/payment endpoint. Omit to keep current endpoint.',
+    },
+};
+const SAP_AGENT_IDENTITY_PLAN_INPUT_SCHEMA = {
+    intendedAction: {
+        type: 'string',
+        enum: ['register', 'update', 'link-metaplex', 'link-sns', 'full-identity'],
+        description: 'Agent identity lifecycle step to plan. Use register for a new SAP agent, update for profile/image/capability changes, link-metaplex for NFT/MPL Core identity, link-sns for .sol identity, or full-identity for the recommended end-to-end flow.',
+    },
+    ...SAP_AGENT_REGISTER_INPUT_SCHEMA,
+    snsDomain: {
+        type: 'string',
+        description: 'Optional .sol domain to link after ownership or registration is verified.',
+    },
+    imageUrl: {
+        type: 'string',
+        description: 'Optional public image URL. This must be HTTPS, IPFS, Arweave, or another public URI; desktop file paths are not valid.',
+    },
+    metaplexAsset: {
+        type: 'string',
+        description: 'Optional Metaplex NFT or MPL Core asset/collection address to reference from public agent metadata.',
+    },
+    ownerWallet: {
+        type: 'string',
+        description: 'Optional expected SAP owner wallet. Use this for verification planning only; signing still comes from the active local SAP profile.',
+    },
+};
 const escrowV2CreateInputSchema = {
     agentWallet: {
         type: 'string',
@@ -68,6 +283,122 @@ const escrowV2CreateInputSchema = {
         description: 'Optional arbiter public key kept for IDL compatibility and dispute workflows.',
     },
 };
+const escrowV2CreateBuilderInputSchema = {
+    depositorWallet: {
+        type: 'string',
+        description: 'Depositor wallet public key (base58). This wallet signs locally and funds the escrow; hosted SAP MCP never receives its private key.',
+    },
+    ...escrowV2CreateInputSchema,
+};
+const escrowV2DepositBuilderInputSchema = {
+    depositorWallet: {
+        type: 'string',
+        description: 'Depositor wallet public key (base58). This wallet signs locally and provides the additional escrow funds.',
+    },
+    agentWallet: {
+        type: 'string',
+        description: 'Agent owner wallet public key (base58). The escrow PDA is derived from agentWallet, depositorWallet, and nonce.',
+    },
+    nonce: {
+        type: 'string',
+        description: 'Optional escrow nonce as a decimal string. Defaults to 0.',
+    },
+    amount: {
+        type: 'string',
+        description: `Deposit amount as a decimal string. ${ESCROW_AMOUNT_DESCRIPTION}`,
+    },
+};
+const escrowV2WithdrawBuilderInputSchema = {
+    depositorWallet: {
+        type: 'string',
+        description: 'Depositor wallet public key (base58). Only the depositor can locally sign a withdrawal from this escrow.',
+    },
+    agentWallet: {
+        type: 'string',
+        description: 'Agent owner wallet public key (base58). The escrow PDA is derived from agentWallet, depositorWallet, and nonce.',
+    },
+    nonce: {
+        type: 'string',
+        description: 'Optional escrow nonce as a decimal string. Defaults to 0.',
+    },
+    amount: {
+        type: 'string',
+        description: `Withdrawal amount as a decimal string. ${ESCROW_AMOUNT_DESCRIPTION}`,
+    },
+};
+const escrowV2SettleBuilderInputSchema = {
+    agentWallet: {
+        type: 'string',
+        description: 'Agent owner wallet public key (base58). This wallet signs locally because settlement releases funds to the serving agent.',
+    },
+    depositorWallet: {
+        type: 'string',
+        description: 'Depositor wallet public key (base58) for the escrow being settled.',
+    },
+    nonce: {
+        type: 'string',
+        description: 'Optional escrow nonce as a decimal string. Defaults to 0.',
+    },
+    callsToSettle: {
+        type: 'string',
+        description: 'Number of served calls to settle as a decimal string.',
+    },
+    serviceHash: {
+        oneOf: [
+            {
+                type: 'array',
+                items: { type: 'number' },
+                description: '32-byte service/audit hash as byte array.',
+            },
+            {
+                type: 'string',
+                description: '32-byte service/audit hash encoded as 64-char hex or base64 string.',
+            },
+        ],
+        description: '32-byte service/audit hash. Use a stable hash of the fulfilled paid work.',
+    },
+    coSigner: {
+        type: 'string',
+        description: 'Optional co-signer public key for CoSigned escrows when the escrow account requires it.',
+    },
+};
+const escrowV2FinalizeBuilderInputSchema = {
+    payerWallet: {
+        type: 'string',
+        description: 'Wallet public key (base58) that signs and pays transaction fees to finalize the pending settlement.',
+    },
+    agentWallet: {
+        type: 'string',
+        description: 'Agent owner wallet public key (base58).',
+    },
+    depositorWallet: {
+        type: 'string',
+        description: 'Depositor wallet public key (base58).',
+    },
+    nonce: {
+        type: 'string',
+        description: 'Optional escrow nonce as a decimal string. Defaults to 0.',
+    },
+    settlementIndex: {
+        type: 'string',
+        description: 'Pending settlement index as a decimal string.',
+    },
+};
+const escrowV2CloseBuilderInputSchema = {
+    depositorWallet: {
+        type: 'string',
+        description: 'Depositor wallet public key (base58). The depositor signs locally to close the empty escrow.',
+    },
+    agentWallet: {
+        type: 'string',
+        description: 'Agent owner wallet public key (base58).',
+    },
+    nonce: {
+        type: 'string',
+        description: 'Optional escrow nonce as a decimal string. Defaults to 0.',
+    },
+};
+const directoryPageInflight = new Map();
 /**
  * @name jsonReplacer
  * @description Serializes SDK values such as PublicKey, BN, bigint, Buffer, and Uint8Array into JSON-safe output.
@@ -90,9 +421,29 @@ function jsonReplacer(_key, value) {
 /**
  * @name ok
  * @description Wraps a successful tool result in the MCP text response shape.
+ *   Includes hostedPricing metadata so agents know the tier and estimated cost.
  */
-function ok(payload) {
-    return createTextResponse(JSON.stringify({ success: true, ...asObjectPayload(payload) }, jsonReplacer, 2));
+function ok(payload, toolName) {
+    const pricingMeta = toolName ? buildHostedPricingMeta(toolName) : undefined;
+    return createTextResponse(JSON.stringify({ success: true, ...(pricingMeta ? { hostedPricing: pricingMeta } : {}), ...asObjectPayload(payload) }, jsonReplacer, 2));
+}
+/**
+ * @name buildHostedPricingMeta
+ * @description Returns a human-readable pricing hint for a SAP SDK tool.
+ *   Uses the same classifyTool function as the hosted monetization gate.
+ */
+function buildHostedPricingMeta(toolName) {
+    const tier = classifyTool(toolName);
+    if (tier === 'free')
+        return 'free — no x402 payment required';
+    const prices = {
+        'read-premium': '~$0.001',
+        'builder': '~$0.008',
+        'value-action': '~$0.09 standard / ~$0.05 heavy',
+        'batch': '~$0.09+',
+    };
+    const price = prices[tier] ?? '~$0.001';
+    return `${tier} tier — estimated ${price} USD per call. Use sap_estimate_tool_cost for exact pricing.`;
 }
 /**
  * @name asObjectPayload
@@ -110,6 +461,22 @@ function asObjectPayload(payload) {
 function getSapAnchorAccounts(client) {
     return client.program.account;
 }
+function stableJson(value) {
+    if (value === undefined) {
+        return 'undefined';
+    }
+    if (value === null) {
+        return 'null';
+    }
+    if (typeof value !== 'object') {
+        return JSON.stringify(value) ?? String(value);
+    }
+    if (Array.isArray(value)) {
+        return `[${value.map(stableJson).join(',')}]`;
+    }
+    const record = value;
+    return `{${Object.keys(record).sort().map((key) => `${JSON.stringify(key)}:${stableJson(record[key])}`).join(',')}}`;
+}
 /**
  * @name bnString
  * @description Converts BN-like SDK counters into stable decimal strings.
@@ -147,6 +514,40 @@ function summarizeProtocolIndexes(protocolIndexes) {
     }))
         .sort((left, right) => left.protocolId.localeCompare(right.protocolId));
 }
+function normalizeDirectoryToken(value) {
+    return value.trim().toLowerCase();
+}
+function matchesNormalizedValue(values, expected) {
+    const normalizedExpected = normalizeDirectoryToken(expected);
+    return values.some((value) => normalizeDirectoryToken(value) === normalizedExpected);
+}
+function matchesNormalizedSubstring(values, query) {
+    return values.some((value) => normalizeDirectoryToken(value).includes(query));
+}
+function encodeDirectoryCursor(offset) {
+    return encodeDirectoryCursorPayload(offset);
+}
+function decodeDirectoryCursor(cursor) {
+    if (!cursor) {
+        return undefined;
+    }
+    try {
+        const parsed = decodeDirectoryCursorPayload(cursor);
+        const offset = parsed.offset;
+        return typeof offset === 'number' && Number.isInteger(offset) && offset >= 0 ? offset : undefined;
+    }
+    catch {
+        throw new Error('cursor must be a nextCursor value returned by sap_list_all_agents or sap_discover_agents');
+    }
+}
+function encodeDirectoryCursorPayload(offset) {
+    const base64 = Buffer.from(JSON.stringify({ offset }), 'utf-8').toString('base64');
+    return base64.replace(/\+/g, '-').replace(/\//g, '_').replace(/=+$/u, '');
+}
+function decodeDirectoryCursorPayload(cursor) {
+    const padded = cursor.replace(/-/g, '+').replace(/_/g, '/').padEnd(Math.ceil(cursor.length / 4) * 4, '=');
+    return JSON.parse(Buffer.from(padded, 'base64').toString('utf-8'));
+}
 /**
  * @name buildAgentDirectoryEntry
  * @description Converts an AgentAccount into a compact directory row with optional stats and protocol-index membership.
@@ -185,14 +586,355 @@ function matchesAgentDirectoryFilters(entry, filters) {
     if (!filters.includeInactive && !entry.isActive) {
         return false;
     }
-    if (filters.protocol && !entry.protocols.includes(filters.protocol) && !entry.indexedProtocols.includes(filters.protocol)) {
+    if (filters.wallet && normalizeDirectoryToken(entry.wallet) !== normalizeDirectoryToken(filters.wallet)) {
+        return false;
+    }
+    if (filters.agentPda && normalizeDirectoryToken(entry.agentPda) !== normalizeDirectoryToken(filters.agentPda)) {
         return false;
     }
-    if (filters.capability && !entry.capabilities.includes(filters.capability)) {
+    if (filters.hasX402Endpoint !== undefined && Boolean(entry.x402Endpoint) !== filters.hasX402Endpoint) {
         return false;
     }
+    if (filters.protocol
+        && !matchesNormalizedValue(entry.protocols, filters.protocol)
+        && !matchesNormalizedValue(entry.indexedProtocols, filters.protocol)) {
+        return false;
+    }
+    const requiredCapabilities = [
+        ...(filters.capability ? [filters.capability] : []),
+        ...(filters.capabilities ?? []),
+    ];
+    if (requiredCapabilities.length > 0) {
+        const mode = filters.capabilityMode ?? 'any';
+        const predicate = (capability) => matchesNormalizedValue(entry.capabilities, capability);
+        if (mode === 'all' ? !requiredCapabilities.every(predicate) : !requiredCapabilities.some(predicate)) {
+            return false;
+        }
+    }
+    const query = filters.query ? normalizeDirectoryToken(filters.query) : undefined;
+    if (query) {
+        const searchableValues = [
+            entry.agentPda,
+            entry.wallet,
+            entry.name,
+            entry.description,
+            entry.agentId,
+            entry.agentUri,
+            entry.x402Endpoint,
+            ...entry.protocols,
+            ...entry.indexedProtocols,
+            ...entry.capabilities,
+            ...entry.activePlugins,
+        ].filter((value) => typeof value === 'string');
+        if (!matchesNormalizedSubstring(searchableValues, query)) {
+            return false;
+        }
+    }
     return true;
 }
+function compactAgentDirectoryEntry(entry) {
+    return {
+        agentPda: entry.agentPda,
+        wallet: entry.wallet,
+        name: entry.name,
+        description: entry.description,
+        agentId: entry.agentId,
+        x402Endpoint: entry.x402Endpoint,
+        isActive: entry.isActive,
+        protocols: entry.protocols,
+        indexedProtocols: entry.indexedProtocols,
+        capabilities: entry.capabilities,
+        reputationScore: entry.reputationScore,
+        totalCallsServed: entry.totalCallsServed,
+        uptimePercent: entry.uptimePercent,
+        createdAt: entry.createdAt,
+    };
+}
+function directoryAgentGuidance(page) {
+    return {
+        paidHostedRead: true,
+        useThisWhen: [
+            'The user asks to find SAP agents, list the ecosystem, inspect available on-chain agents, or discover x402-enabled agents.',
+            'Use query/protocol/capability/capabilities filters first; avoid repeated broad scans.',
+        ],
+        pagination: page.hasMore
+            ? `Call the same tool with cursor="${page.nextCursor}" to fetch the next page.`
+            : 'No further page is available for the current filters.',
+        nextTools: [
+            'sap_get_agent_profile with wallet for one hydrated owner profile.',
+            'sap_fetch_protocol_index with protocolId when the user wants protocol membership.',
+            'sap_fetch_capability_index with capabilityId when the user wants a capability-specific index.',
+            'sap_x402_estimate_cost before calling a paid x402 endpoint exposed by a discovered agent.',
+        ],
+        matchingNotes: {
+            query: 'Matches name, description, agentId, wallet, PDA, endpoint, protocols, capabilities, and active plugin labels.',
+            capability: 'Capability matching is case-insensitive and exact after trimming. For multiple capabilities set capabilityMode to any or all.',
+            x402: 'Set hasX402Endpoint=true to find agents that advertise paid HTTP/x402 resources.',
+        },
+    };
+}
+async function buildAgentDirectoryPage(client, options) {
+    const accounts = getSapAnchorAccounts(client);
+    const [agentAccounts, statsAccounts, protocolIndexes, overview] = await Promise.all([
+        accounts.agentAccount.all(),
+        accounts.agentStats.all(),
+        accounts.protocolIndex.all(),
+        client.discovery.getNetworkOverview(),
+    ]);
+    const statsByAgent = new Map(statsAccounts.map(({ account }) => [account.agent.toBase58(), account]));
+    const indexedProtocolsByAgent = buildProtocolMembership(protocolIndexes);
+    const filteredAgents = agentAccounts
+        .map((account) => buildAgentDirectoryEntry(account, statsByAgent, indexedProtocolsByAgent))
+        .filter((entry) => matchesAgentDirectoryFilters(entry, options))
+        .sort((left, right) => Number(right.createdAt) - Number(left.createdAt));
+    const page = filteredAgents.slice(options.offset, options.offset + options.limit);
+    const hasMore = options.offset + page.length < filteredAgents.length;
+    const nextOffset = hasMore ? options.offset + page.length : null;
+    const nextCursor = nextOffset === null ? null : encodeDirectoryCursor(nextOffset);
+    const agents = options.view === 'compact' ? page.map(compactAgentDirectoryEntry) : page;
+    return {
+        source: 'program.account.agentAccount.all + program.account.protocolIndex.all',
+        freshness: {
+            status: 'fresh',
+            cache: 'disabled',
+            fetchedAt: new Date().toISOString(),
+        },
+        overview,
+        filters: {
+            includeInactive: options.includeInactive,
+            protocol: options.protocol ?? null,
+            capability: options.capability ?? null,
+            capabilities: options.capabilities ?? [],
+            capabilityMode: options.capabilityMode ?? 'any',
+            query: options.query ?? null,
+            wallet: options.wallet ?? null,
+            agentPda: options.agentPda ?? null,
+            hasX402Endpoint: options.hasX402Endpoint ?? null,
+            view: options.view,
+        },
+        count: page.length,
+        totalEnumerated: filteredAgents.length,
+        returned: page.length,
+        offset: options.offset,
+        limit: options.limit,
+        truncated: hasMore,
+        pagination: {
+            total: filteredAgents.length,
+            returned: page.length,
+            offset: options.offset,
+            limit: options.limit,
+            hasMore,
+            nextOffset,
+            nextCursor,
+        },
+        totalAgentAccounts: agentAccounts.length,
+        activeAgentAccounts: agentAccounts.filter(({ account }) => account.isActive).length,
+        protocolIndexes: options.includeProtocolIndexes ? summarizeProtocolIndexes(protocolIndexes) : undefined,
+        agents,
+        agentGuidance: directoryAgentGuidance({ hasMore, nextCursor, filters: options }),
+    };
+}
+async function getFreshAgentDirectoryPage(client, options) {
+    const cacheKey = stableJson(options);
+    const inflight = directoryPageInflight.get(cacheKey);
+    if (inflight) {
+        const page = await inflight;
+        return {
+            ...page,
+            freshness: {
+                ...page.freshness,
+                status: 'fresh_joined_inflight',
+                cache: 'disabled',
+                key: cacheKey.slice(0, 24),
+            },
+        };
+    }
+    const load = buildAgentDirectoryPage(client, options)
+        .finally(() => {
+        directoryPageInflight.delete(cacheKey);
+    });
+    directoryPageInflight.set(cacheKey, load);
+    const page = await load;
+    return {
+        ...page,
+        freshness: {
+            ...page.freshness,
+            status: 'fresh',
+            cache: 'disabled',
+            key: cacheKey.slice(0, 24),
+        },
+    };
+}
+async function buildSapAgentContext(input, client) {
+    const wallet = optionalString(input, 'wallet');
+    const agentPda = optionalString(input, 'agentPda');
+    const query = optionalString(input, 'query');
+    const limit = Math.max(1, Math.min(optionalNumber(input, 'limit') ?? 10, 20));
+    const exact = {};
+    if (wallet) {
+        const owner = new PublicKey(wallet);
+        const derivedAgentPda = client.agent.deriveAgent(owner)[0].toBase58();
+        const [agent, active, profile] = await Promise.all([
+            client.agent.fetchNullable(owner),
+            client.discovery.isAgentActive(owner).catch(() => false),
+            client.discovery.getAgentProfile(owner).catch((error) => ({
+                unavailable: true,
+                reason: error instanceof Error ? error.message : 'profile_fetch_failed',
+            })),
+        ]);
+        exact.wallet = wallet;
+        exact.agentPda = derivedAgentPda;
+        exact.active = active;
+        exact.agent = agent;
+        exact.profile = profile;
+    }
+    const directory = wallet
+        ? null
+        : await getFreshAgentDirectoryPage(client, {
+            includeInactive: false,
+            protocol: undefined,
+            capability: undefined,
+            capabilities: [],
+            capabilityMode: 'any',
+            query,
+            wallet: undefined,
+            agentPda,
+            hasX402Endpoint: undefined,
+            limit,
+            offset: 0,
+            view: 'compact',
+            includeProtocolIndexes: false,
+        });
+    return {
+        contextType: wallet ? 'exact-wallet' : agentPda ? 'exact-agent-pda' : query ? 'compact-query' : 'compact-orientation',
+        freeRead: true,
+        exact,
+        directory,
+        routing: {
+            firstReads: [
+                'Use sap_get_agent or sap_get_agent_profile when the owner wallet is known.',
+                'Use sap_list_agents with limit <= 20 and view: compact for free orientation.',
+                'Use sap_discover_agents or sap_list_all_agents only for paid search, enriched rows, large pages, or ecosystem-scale scans.',
+            ],
+            paidHostedTools: 'Use sap_payments_call_paid_tool when a hosted tool returns x402 payment_required and the runtime cannot replay x402 natively.',
+            registryWrites: 'Use sap_payments_register_agent and sap_payments_update_agent for wallet-owned SAP registry writes. Do not retry hosted accountless writes after hosted_local_signer_required.',
+            unsignedTransactions: 'Use hosted builders when available, then sap_payments_finalize_transaction with submit:true after user confirmation.',
+        },
+        nextActions: [
+            wallet ? 'If the user wants details, use the exact profile already returned here before paid discovery.' : 'If the user selects an agent row, call sap_get_agent_profile with that row wallet.',
+            'For registration or image/profile updates, call sap_agent_identity_plan before any write.',
+            'For paid or write flows, call sap_payments_readiness first when the local bridge is visible.',
+        ],
+    };
+}
+function parseCapabilityMode(input) {
+    const mode = optionalString(input, 'capabilityMode')?.trim().toLowerCase();
+    if (!mode) {
+        return 'any';
+    }
+    if (mode === 'any' || mode === 'all') {
+        return mode;
+    }
+    throw new Error('capabilityMode must be "any" or "all"');
+}
+function parseOptionalStringArray(input, field) {
+    const value = input[field];
+    if (value === undefined || value === null) {
+        return [];
+    }
+    if (!Array.isArray(value)) {
+        throw new Error(`${field} must be an array of strings`);
+    }
+    return value
+        .filter((item) => typeof item === 'string' && item.trim().length > 0)
+        .map((item) => item.trim());
+}
+function parseDirectoryOffset(input) {
+    return Math.max(0, decodeDirectoryCursor(optionalString(input, 'cursor')) ?? optionalNumber(input, 'offset') ?? 0);
+}
+function parseDirectoryView(input) {
+    const view = optionalString(input, 'view');
+    if (!view && input.hydrate === true) {
+        return 'full';
+    }
+    if (!view || view === 'compact') {
+        return 'compact';
+    }
+    if (view === 'full') {
+        return 'full';
+    }
+    throw new Error('view must be "compact" or "full"');
+}
+function parseHasX402Endpoint(input) {
+    return optionalBoolean(input, 'hasX402Endpoint');
+}
+function makeAgentDirectoryInputSchema(defaultLimit) {
+    return {
+        query: {
+            type: 'string',
+            description: 'Optional text search across name, description, agentId, wallet, PDA, x402 endpoint, protocols, capabilities, and active plugins. Example: "XONA" or "creative".',
+        },
+        wallet: {
+            type: 'string',
+            description: 'Optional exact owner wallet public key filter. Use this when a wallet is known; it is the most reliable lookup path.',
+        },
+        agentPda: {
+            type: 'string',
+            description: 'Optional exact SAP agent PDA filter.',
+        },
+        protocol: {
+            type: 'string',
+            description: 'Optional protocol filter matched case-insensitively against agent protocols and protocol-index membership. Example: "jupiter", "creative", "payments".',
+        },
+        capability: {
+            type: 'string',
+            description: 'Optional single capability ID filter matched case-insensitively. Example: "creative:imageGeneration" or "jupiter:swap".',
+        },
+        capabilities: {
+            type: 'array',
+            items: { type: 'string' },
+            description: 'Optional list of capability IDs. Use capabilityMode="all" when the agent must have every capability.',
+        },
+        capabilityMode: {
+            type: 'string',
+            enum: ['any', 'all'],
+            description: 'How to match the capability/capabilities filters. Defaults to "any".',
+        },
+        hasX402Endpoint: {
+            type: 'boolean',
+            description: 'Optional filter for agents that advertise a paid HTTP/x402 endpoint.',
+        },
+        includeInactive: {
+            type: 'boolean',
+            description: 'Include inactive agents. Defaults to false.',
+        },
+        limit: {
+            type: 'number',
+            description: `Maximum rows to return. Defaults to ${defaultLimit}; hard-capped at 500.`,
+        },
+        offset: {
+            type: 'number',
+            description: 'Zero-based pagination offset. Defaults to 0. Prefer cursor after the first page when nextCursor is returned.',
+        },
+        cursor: {
+            type: 'string',
+            description: 'Opaque pagination cursor returned as pagination.nextCursor by a previous sap_list_all_agents or sap_discover_agents call.',
+        },
+        view: {
+            type: 'string',
+            enum: ['compact', 'full'],
+            description: 'Result shape. Use compact for broad discovery and full for detailed rows. Defaults to compact.',
+        },
+        hydrate: {
+            type: 'boolean',
+            description: 'Deprecated compatibility alias. Use view="full" for full rows or view="compact" for directory rows.',
+        },
+        includeProtocolIndexes: {
+            type: 'boolean',
+            description: 'Include compact protocol index summaries. Defaults to false for sap_discover_agents and true for sap_list_all_agents.',
+        },
+    };
+}
 /**
  * @name asRecord
  * @description Normalizes MCP tool input into an object.
@@ -317,6 +1059,45 @@ function parseVolumeCurve(value) {
         };
     });
 }
+/**
+ * @name optionalTokenType
+ * @description Converts public tokenType strings into SDK Anchor enum variants.
+ */
+function optionalTokenType(input) {
+    const raw = optionalString(input, 'tokenType') ?? 'sol';
+    const normalized = raw.trim().toLowerCase();
+    if (normalized === 'sol' || normalized === 'native' || normalized === 'lamports') {
+        return { tokenType: TokenType.Sol, decimalsFallback: 9 };
+    }
+    if (normalized === 'usdc' || normalized === 'micro-usdc' || normalized === 'micro_usdc') {
+        return { tokenType: TokenType.Usdc, decimalsFallback: 6 };
+    }
+    if (normalized === 'spl' || normalized === 'token') {
+        return { tokenType: TokenType.Spl, decimalsFallback: 0 };
+    }
+    throw new Error('tokenType must be one of sol, usdc, or spl');
+}
+/**
+ * @name optionalSettlementMode
+ * @description Converts public settlementMode strings into SDK Anchor enum variants.
+ */
+function optionalSettlementMode(input) {
+    const raw = optionalString(input, 'settlementMode') ?? 'escrow';
+    const normalized = raw.trim().toLowerCase();
+    if (normalized === 'instant') {
+        return SettlementMode.Instant;
+    }
+    if (normalized === 'escrow') {
+        return SettlementMode.Escrow;
+    }
+    if (normalized === 'batched' || normalized === 'batch') {
+        return SettlementMode.Batched;
+    }
+    if (normalized === 'x402' || normalized === 'pay.sh' || normalized === 'paysh') {
+        return SettlementMode.X402;
+    }
+    throw new Error('settlementMode must be one of instant, escrow, batched, or x402');
+}
 /**
  * @name requiredBytes
  * @description Reads byte-array fields used for hashes, nonces, and encrypted payloads.
@@ -423,6 +1204,12 @@ function parsePricingTiers(value) {
     return value.map((item) => {
         const record = asRecord(item);
         const pricePerCall = optionalBn(record, 'pricePerCall', new BN(0));
+        const { tokenType, decimalsFallback } = optionalTokenType(record);
+        const tokenMint = optionalPublicKey(record, 'tokenMint') ?? null;
+        if (tokenType === TokenType.Spl && tokenMint === null) {
+            throw new Error('pricing.tokenMint is required when tokenType is spl');
+        }
+        const volumeCurve = parseVolumeCurve(record.volumeCurve);
         return {
             tierId: optionalString(record, 'tierId') ?? 'default',
             pricePerCall,
@@ -431,13 +1218,13 @@ function parsePricingTiers(value) {
             rateLimit: optionalNumber(record, 'rateLimit') ?? 60,
             maxCallsPerSession: optionalNumber(record, 'maxCallsPerSession') ?? 1_000,
             burstLimit: optionalNumber(record, 'burstLimit') ?? null,
-            tokenType: TokenType.Sol,
-            tokenMint: optionalPublicKey(record, 'tokenMint') ?? null,
-            tokenDecimals: optionalNumber(record, 'tokenDecimals') ?? null,
-            settlementMode: SettlementMode.Escrow,
+            tokenType,
+            tokenMint,
+            tokenDecimals: optionalNumber(record, 'tokenDecimals') ?? decimalsFallback,
+            settlementMode: optionalSettlementMode(record),
             minEscrowDeposit: record.minEscrowDeposit === undefined ? null : requiredBn(record, 'minEscrowDeposit'),
             batchIntervalSec: optionalNumber(record, 'batchIntervalSec') ?? null,
-            volumeCurve: null,
+            volumeCurve: volumeCurve.length > 0 ? volumeCurve : null,
         };
     });
 }
@@ -463,7 +1250,7 @@ function parseProtocols(value) {
  * @name parseRegisterAgentArgs
  * @description Builds strongly typed `RegisterAgentArgs` from MCP JSON input.
  */
-function parseRegisterAgentArgs(input) {
+export function parseRegisterAgentArgs(input) {
     return {
         name: requiredString(input, 'name'),
         description: requiredString(input, 'description'),
@@ -479,7 +1266,7 @@ function parseRegisterAgentArgs(input) {
  * @name parseUpdateAgentArgs
  * @description Builds strongly typed `UpdateAgentArgs` from MCP JSON input.
  */
-function parseUpdateAgentArgs(input) {
+export function parseUpdateAgentArgs(input) {
     return {
         name: optionalString(input, 'name') ?? null,
         description: optionalString(input, 'description') ?? null,
@@ -491,6 +1278,168 @@ function parseUpdateAgentArgs(input) {
         x402Endpoint: optionalString(input, 'x402Endpoint') ?? null,
     };
 }
+function parseIdentityPlanAction(input) {
+    const value = optionalString(input, 'intendedAction') ?? 'full-identity';
+    if (['register', 'update', 'link-metaplex', 'link-sns', 'full-identity'].includes(value)) {
+        return value;
+    }
+    throw new Error('intendedAction must be one of register, update, link-metaplex, link-sns, full-identity');
+}
+function optionalPublicMetadataUri(input) {
+    return optionalString(input, 'metadataUri') ?? optionalString(input, 'agentUri') ?? null;
+}
+function buildSapAgentIdentityPlan(input) {
+    const intendedAction = parseIdentityPlanAction(input);
+    const metadataUri = optionalPublicMetadataUri(input);
+    const imageUrl = optionalString(input, 'imageUrl') ?? null;
+    const metaplexAsset = optionalString(input, 'metaplexAsset') ?? null;
+    const snsDomain = optionalString(input, 'snsDomain') ?? null;
+    const ownerWallet = optionalString(input, 'ownerWallet') ?? null;
+    const missingRegisterFields = ['name', 'description', 'capabilities', 'protocols']
+        .filter((field) => input[field] === undefined || input[field] === null);
+    const hasCompleteRegisterFields = missingRegisterFields.length === 0;
+    const registerArgs = hasCompleteRegisterFields
+        ? parseRegisterAgentArgs({
+            ...input,
+            capabilities: input.capabilities ?? [],
+            pricing: input.pricing ?? [],
+            protocols: input.protocols ?? [],
+        })
+        : null;
+    const updateArgs = parseUpdateAgentArgs(input);
+    return {
+        intendedAction,
+        trustBoundary: {
+            hostedSap: 'Use hosted sap for reads, paid hosted tools, and unsigned builders.',
+            localSapPayments: 'Use local sap_payments for x402 payment signing, SAP registry writes, and transaction finalization.',
+            keypairMaterial: 'Never read or export keypair JSON. Only local SAP MCP signer tools may sign.',
+        },
+        nextTools: {
+            readiness: 'sap_payments_readiness',
+            register: intendedAction === 'register' || intendedAction === 'full-identity' ? 'sap_payments_register_agent' : null,
+            update: intendedAction !== 'register' ? 'sap_payments_update_agent' : null,
+            metaplex: metaplexAsset ? 'metaplex-nft_* or DAS verification tools before SAP metadata update' : null,
+            sns: snsDomain ? ['sap_sns_check_domain', 'sap_sns_check_ownership', 'sap_sns_build_manage_record_transaction when managing records'] : null,
+            profileVerification: 'sap_get_agent_profile',
+        },
+        missingRegisterFields,
+        normalizedRegistration: registerArgs
+            ? {
+                name: registerArgs.name,
+                description: registerArgs.description,
+                agentId: registerArgs.agentId,
+                agentUri: registerArgs.agentUri,
+                x402Endpoint: registerArgs.x402Endpoint,
+                protocols: registerArgs.protocols,
+                capabilities: registerArgs.capabilities,
+                pricing: registerArgs.pricing,
+                confirm: true,
+            }
+            : null,
+        normalizedUpdate: {
+            name: updateArgs.name,
+            description: updateArgs.description,
+            agentId: updateArgs.agentId,
+            agentUri: updateArgs.agentUri,
+            x402Endpoint: updateArgs.x402Endpoint,
+            protocols: updateArgs.protocols,
+            capabilities: updateArgs.capabilities,
+            pricing: updateArgs.pricing,
+            confirm: true,
+        },
+        publicMetadataContract: {
+            requiredForImages: true,
+            metadataUri,
+            imageUrl,
+            metaplexAsset,
+            snsDomain,
+            recommendedShape: {
+                name: input.name ?? '<agent name>',
+                description: input.description ?? '<agent description>',
+                image: imageUrl ?? '<public image URL>',
+                external_url: ownerWallet ? `https://explorer.oobeprotocol.ai/agents/${ownerWallet}` : '<public agent page>',
+                attributes: [
+                    { trait_type: 'Protocol', value: 'SAP' },
+                    { trait_type: 'Identity', value: [metaplexAsset ? 'Metaplex' : null, snsDomain ? 'SNS' : null].filter(Boolean).join(' + ') || 'SAP' },
+                ],
+                sap: {
+                    ownerWallet: ownerWallet ?? '<owner wallet>',
+                    agentId: optionalString(input, 'agentId') ?? '<stable id>',
+                    capabilities: Array.isArray(input.capabilities) ? input.capabilities : [],
+                },
+                metaplex: metaplexAsset ? { asset: metaplexAsset } : null,
+                sns: snsDomain ? { domain: snsDomain } : null,
+                x402: optionalString(input, 'x402Endpoint') ? { endpoint: optionalString(input, 'x402Endpoint') } : null,
+            },
+        },
+        verificationChecklist: [
+            'Call sap_payments_readiness before paid/write actions.',
+            'For registration, call sap_payments_register_agent with confirm:true; do not call hosted sap_register_agent after hosted_local_signer_required.',
+            'Verify sap_payments_register_agent success, confirmationStatus, agentPda, and protocolFee.status.',
+            'Fetch sap_get_agent_profile by owner wallet after registration or update.',
+            'For update, verify every intended replacement field because arrays are full replacements.',
+            'For Metaplex identity, verify the asset/collection metadata URI and update authority before linking it from SAP metadata.',
+            'For SNS identity, verify domain ownership and records before claiming the .sol identity is linked.',
+        ],
+        forbiddenActions: [
+            'Do not create temporary signing scripts.',
+            'Do not read keypair JSON.',
+            'Do not reuse stale x402 payment signatures.',
+            'Do not pay hosted x402 fees for hosted_local_signer_required registry writes.',
+            'Do not announce lifecycle complete if protocolFee.status is missing_or_underpaid.',
+        ],
+    };
+}
+function buildSapProtocolInvariants() {
+    return {
+        protocol: {
+            name: 'Synapse Agent Protocol',
+            programId: DEFAULT_SAP_PROGRAM_ID,
+            network: 'mainnet-beta',
+            custodyModel: 'non-custodial',
+        },
+        registrationFee: {
+            sourceExpected: true,
+            treasury: SAP_PROTOCOL_TREASURY,
+            lamports: SAP_REGISTRATION_FEE_LAMPORTS.toString(10),
+            sol: Number(SAP_REGISTRATION_FEE_LAMPORTS) / 1_000_000_000,
+            verification: 'sap_payments_register_agent verifies the landed transaction pre/post balance delta for the treasury account because deployed program behavior can drift from the source-level invariant.',
+            failureStatus: 'missing_or_underpaid',
+            failureRule: 'If protocolFee.status is missing_or_underpaid, the agent account can still exist, but sap_payments_register_agent must return success:false, agentRegistered:true, and protocolComplete:false. Do not retry registration automatically; inspect the signature, deployed SAP program, and treasury delta first.',
+        },
+        hostedWritePolicy: {
+            register: 'Hosted sap_register_agent is accountless and returns hosted_local_signer_required before x402 payment.',
+            update: 'Hosted sap_update_agent is accountless and returns hosted_local_signer_required before x402 payment.',
+            sns: 'Hosted direct SNS writes require a local signer or unsigned builder. If no builder exists, stop and route through local SAP MCP.',
+            noChargeRule: 'hosted_local_signer_required is a routing guard, not a paid failure; no hosted x402 fee should be charged for that blocked write.',
+        },
+        localSignerRoutes: {
+            readiness: 'sap_payments_readiness',
+            registerAgent: 'sap_payments_register_agent',
+            updateAgent: 'sap_payments_update_agent',
+            finalizeUnsignedTransaction: 'sap_payments_finalize_transaction',
+            paidHostedTool: 'sap_payments_call_paid_tool',
+            externalX402Http: 'sap_payments_call_external_x402',
+        },
+        identityPipeline: [
+            'Call sap_agent_identity_plan for register, update, Metaplex, SNS, or full-identity intent.',
+            'Upload image and metadata to a public URL before writing agentUri or metadataUri.',
+            'Use sap_payments_register_agent for local non-custodial registration.',
+            'Verify success, agentRegistered, confirmationStatus, agentPda, protocolComplete, and protocolFee.status.',
+            'Use Metaplex/MPL Core tools only after metadata authority and URI are clear.',
+            'Use SNS tools only after domain availability/ownership and user confirmation are clear.',
+            'Use sap_payments_update_agent for profile image, metadata, capabilities, pricing, protocols, or x402 endpoint updates.',
+            'Fetch sap_get_agent_profile after every registry write and compare intended fields.',
+        ],
+        forbiddenActions: [
+            'Do not create temporary signing scripts.',
+            'Do not read keypair JSON.',
+            'Do not call hosted sap_sign_transaction for user-owned signatures.',
+            'Do not call hosted sap_register_agent or sap_update_agent again after hosted_local_signer_required.',
+            'Do not call an agent lifecycle complete when protocolFee.status is missing_or_underpaid, unavailable, or anything other than verified.',
+        ],
+    };
+}
 /**
  * @name parseX402PreparePaymentOptions
  * @description Builds typed x402 payment preparation options from MCP JSON input.
@@ -608,6 +1557,433 @@ function parseEscrowV2Args(input) {
         arbiter: optionalPublicKey(input, 'arbiter') ?? null,
     };
 }
+function publicKeyOrNull(value) {
+    return value instanceof PublicKey ? value : null;
+}
+function bnToBigInt(value) {
+    if (typeof value === 'bigint') {
+        return value;
+    }
+    if (typeof value === 'number') {
+        return BigInt(value);
+    }
+    return BigInt(value.toString());
+}
+function bnToPdaSeed(value, field) {
+    const asBigInt = BigInt(value.toString(10));
+    if (asBigInt < 0n) {
+        throw new Error(`${field} must be >= 0`);
+    }
+    return asBigInt;
+}
+function serializeAccountMetas(accounts) {
+    return accounts.map((account) => ({
+        pubkey: account.pubkey.toBase58(),
+        isSigner: account.isSigner,
+        isWritable: account.isWritable,
+    }));
+}
+function validateEscrowPaymentMint(tokenMint) {
+    if (!tokenMint) {
+        return;
+    }
+    if (!tokenMint.equals(USDC_MINT_MAINNET) && !tokenMint.equals(USDC_MINT_DEVNET)) {
+        throw new Error('Escrow V2 hosted builders only accept native SOL or USDC mints supported by the current SAP program.');
+    }
+}
+function deriveAssociatedTokenAddress(tokenMint, owner) {
+    const [address] = PublicKey.findProgramAddressSync([owner.toBuffer(), TOKEN_PROGRAM_ID.toBuffer(), tokenMint.toBuffer()], ASSOCIATED_TOKEN_PROGRAM_ID);
+    return address;
+}
+function getEscrowPdas(client, agentWallet, depositorWallet, nonce) {
+    const [agentPda] = Pda.deriveAgent(agentWallet, client.programId);
+    const [escrowPda] = Pda.deriveEscrowV2(agentPda, depositorWallet, bnToPdaSeed(nonce, 'nonce'), client.programId);
+    const [agentStake] = Pda.deriveStake(agentPda, client.programId);
+    const [agentStats] = Pda.deriveAgentStats(agentPda, client.programId);
+    const [pricingMenu] = Pda.derivePricingMenu(agentPda, client.programId);
+    return { agentPda, escrowPda, agentStake, agentStats, pricingMenu };
+}
+function buildSplRemainingAccounts(tokenMint, sourceOwner, destinationOwner) {
+    if (!tokenMint) {
+        return [];
+    }
+    return [
+        {
+            pubkey: deriveAssociatedTokenAddress(tokenMint, sourceOwner),
+            isSigner: false,
+            isWritable: true,
+        },
+        {
+            pubkey: deriveAssociatedTokenAddress(tokenMint, destinationOwner),
+            isSigner: false,
+            isWritable: true,
+        },
+        { pubkey: tokenMint, isSigner: false, isWritable: false },
+        { pubkey: TOKEN_PROGRAM_ID, isSigner: false, isWritable: false },
+    ];
+}
+function buildEscrowSettlementRemainingAccounts(params) {
+    const accounts = params.tokenMint
+        ? [
+            ...buildSplRemainingAccounts(params.tokenMint, params.escrowPda, params.agentWallet),
+            {
+                pubkey: deriveAssociatedTokenAddress(params.tokenMint, new PublicKey(SAP_PROTOCOL_TREASURY)),
+                isSigner: false,
+                isWritable: true,
+            },
+        ]
+        : [
+            {
+                pubkey: new PublicKey(SAP_PROTOCOL_TREASURY),
+                isSigner: false,
+                isWritable: true,
+            },
+        ];
+    if (params.pendingSettlementPda) {
+        accounts.push({ pubkey: params.pendingSettlementPda, isSigner: false, isWritable: true });
+    }
+    if (params.coSigner) {
+        accounts.push({ pubkey: params.coSigner, isSigner: true, isWritable: false });
+    }
+    return accounts;
+}
+async function serializeUnsignedTransaction(client, feePayer, instructions) {
+    const latestBlockhash = await client.connection.getLatestBlockhash('confirmed');
+    const tx = new Transaction();
+    tx.feePayer = feePayer;
+    tx.recentBlockhash = latestBlockhash.blockhash;
+    for (const instruction of instructions) {
+        tx.add(instruction);
+    }
+    return {
+        transactionBase64: Buffer.from(tx.serialize({ requireAllSignatures: false })).toString('base64'),
+        blockhash: latestBlockhash.blockhash,
+        lastValidBlockHeight: latestBlockhash.lastValidBlockHeight,
+    };
+}
+async function fetchEscrowV2Nullable(client, escrowPda) {
+    const accounts = getSapAnchorAccounts(client);
+    return accounts.escrowAccountV2.fetchNullable(escrowPda);
+}
+async function fetchPendingSettlementNullable(client, pendingPda) {
+    const accounts = getSapAnchorAccounts(client);
+    return accounts.pendingSettlement.fetchNullable(pendingPda);
+}
+function isDisputeWindowEscrow(escrow) {
+    const security = escrow.settlementSecurity;
+    return typeof security === 'object' && security !== null && 'disputeWindow' in security;
+}
+function isCoSignedEscrow(escrow) {
+    const security = escrow.settlementSecurity;
+    return typeof security === 'object' && security !== null && 'coSigned' in security;
+}
+function escrowBuilderResponse(params) {
+    return {
+        action: params.action,
+        transactionBase64: params.transactionBase64,
+        encoding: 'base64',
+        requiredSigner: params.requiredSigner.toBase58(),
+        requiredSignerRole: params.requiredSignerRole,
+        submitWith: 'sap_payments_finalize_transaction',
+        nextStep: 'Call sap_payments_finalize_transaction with transactionBase64, submit:true, confirm:true, and the same user-approved intent. Do not create temporary signing scripts and do not read keypair JSON.',
+        accounts: {
+            ...params.accounts,
+            blockhash: params.blockhash,
+            lastValidBlockHeight: params.lastValidBlockHeight,
+        },
+        tokenMode: params.tokenMint ? 'SPL' : 'SOL',
+        ...(params.security ? { security: params.security } : {}),
+        ...(params.warnings && params.warnings.length > 0 ? { warnings: params.warnings } : {}),
+    };
+}
+async function buildEscrowCreateTransaction(input, client) {
+    const depositorWallet = requiredPublicKey(input, 'depositorWallet');
+    const agentWallet = requiredPublicKey(input, 'agentWallet');
+    const args = parseEscrowV2Args(input);
+    validateEscrowPaymentMint(args.tokenMint);
+    const pdas = getEscrowPdas(client, agentWallet, depositorWallet, args.escrowNonce);
+    const remainingAccounts = buildSplRemainingAccounts(args.tokenMint, depositorWallet, pdas.escrowPda);
+    const methods = client.program.methods;
+    const instruction = await methods.createEscrowV2(args.escrowNonce, args.pricePerCall, args.maxCalls, args.initialDeposit, args.expiresAt, args.volumeCurve, args.tokenMint, args.tokenDecimals, args.settlementSecurity, args.disputeWindowSlots, args.coSigner, args.arbiter)
+        .accounts({
+        depositor: depositorWallet,
+        agent: pdas.agentPda,
+        agentStake: pdas.agentStake,
+        agentStats: pdas.agentStats,
+        pricingMenu: pdas.pricingMenu,
+        escrow: pdas.escrowPda,
+        systemProgram: SystemProgram.programId,
+    })
+        .remainingAccounts(remainingAccounts)
+        .instruction();
+    const tx = await serializeUnsignedTransaction(client, depositorWallet, [instruction]);
+    return escrowBuilderResponse({
+        action: 'create_escrow_v2',
+        transactionBase64: tx.transactionBase64,
+        requiredSigner: depositorWallet,
+        requiredSignerRole: 'depositor',
+        tokenMint: args.tokenMint,
+        blockhash: tx.blockhash,
+        lastValidBlockHeight: tx.lastValidBlockHeight,
+        accounts: {
+            agentWallet,
+            depositorWallet,
+            agentPda: pdas.agentPda,
+            escrowPda: pdas.escrowPda,
+            agentStake: pdas.agentStake,
+            agentStats: pdas.agentStats,
+            pricingMenu: pdas.pricingMenu,
+            remainingAccounts: serializeAccountMetas(remainingAccounts),
+        },
+        security: {
+            settlementSecurity: args.settlementSecurity,
+            disputeWindowSlots: args.disputeWindowSlots,
+            coSigner: args.coSigner,
+            arbiter: args.arbiter,
+        },
+    });
+}
+async function buildEscrowDepositTransaction(input, client) {
+    const depositorWallet = requiredPublicKey(input, 'depositorWallet');
+    const agentWallet = requiredPublicKey(input, 'agentWallet');
+    const nonce = optionalBn(input, 'nonce', new BN(0));
+    const amount = requiredBn(input, 'amount');
+    const pdas = getEscrowPdas(client, agentWallet, depositorWallet, nonce);
+    const escrow = await fetchEscrowV2Nullable(client, pdas.escrowPda);
+    if (!escrow) {
+        throw new Error(`Escrow V2 PDA ${pdas.escrowPda.toBase58()} does not exist. Build and finalize sap_escrow_build_create_transaction first.`);
+    }
+    const tokenMint = publicKeyOrNull(escrow.tokenMint);
+    const remainingAccounts = buildSplRemainingAccounts(tokenMint, depositorWallet, pdas.escrowPda);
+    const methods = client.program.methods;
+    const instruction = await methods.depositEscrowV2(nonce, amount)
+        .accounts({
+        depositor: depositorWallet,
+        escrow: pdas.escrowPda,
+        systemProgram: SystemProgram.programId,
+    })
+        .remainingAccounts(remainingAccounts)
+        .instruction();
+    const tx = await serializeUnsignedTransaction(client, depositorWallet, [instruction]);
+    return escrowBuilderResponse({
+        action: 'deposit_escrow_v2',
+        transactionBase64: tx.transactionBase64,
+        requiredSigner: depositorWallet,
+        requiredSignerRole: 'depositor',
+        tokenMint,
+        blockhash: tx.blockhash,
+        lastValidBlockHeight: tx.lastValidBlockHeight,
+        accounts: {
+            agentWallet,
+            depositorWallet,
+            escrowPda: pdas.escrowPda,
+            amount,
+            remainingAccounts: serializeAccountMetas(remainingAccounts),
+        },
+    });
+}
+async function buildEscrowWithdrawTransaction(input, client) {
+    const depositorWallet = requiredPublicKey(input, 'depositorWallet');
+    const agentWallet = requiredPublicKey(input, 'agentWallet');
+    const nonce = optionalBn(input, 'nonce', new BN(0));
+    const amount = requiredBn(input, 'amount');
+    const pdas = getEscrowPdas(client, agentWallet, depositorWallet, nonce);
+    const escrow = await fetchEscrowV2Nullable(client, pdas.escrowPda);
+    if (!escrow) {
+        throw new Error(`Escrow V2 PDA ${pdas.escrowPda.toBase58()} does not exist.`);
+    }
+    const balance = bnToBigInt(escrow.balance);
+    const pendingAmount = bnToBigInt(escrow.pendingAmount);
+    const withdrawable = balance > pendingAmount ? balance - pendingAmount : 0n;
+    if (BigInt(amount.toString(10)) > withdrawable) {
+        throw new Error(`Withdraw amount exceeds withdrawable escrow balance. requested=${amount.toString(10)}, withdrawable=${withdrawable.toString()}.`);
+    }
+    const tokenMint = publicKeyOrNull(escrow.tokenMint);
+    const remainingAccounts = buildSplRemainingAccounts(tokenMint, pdas.escrowPda, depositorWallet);
+    const methods = client.program.methods;
+    const instruction = await methods.withdrawEscrowV2(amount)
+        .accounts({
+        depositor: depositorWallet,
+        escrow: pdas.escrowPda,
+    })
+        .remainingAccounts(remainingAccounts)
+        .instruction();
+    const tx = await serializeUnsignedTransaction(client, depositorWallet, [instruction]);
+    return escrowBuilderResponse({
+        action: 'withdraw_escrow_v2',
+        transactionBase64: tx.transactionBase64,
+        requiredSigner: depositorWallet,
+        requiredSignerRole: 'depositor',
+        tokenMint,
+        blockhash: tx.blockhash,
+        lastValidBlockHeight: tx.lastValidBlockHeight,
+        accounts: {
+            agentWallet,
+            depositorWallet,
+            escrowPda: pdas.escrowPda,
+            amount,
+            withdrawable: withdrawable.toString(),
+            remainingAccounts: serializeAccountMetas(remainingAccounts),
+        },
+    });
+}
+async function buildEscrowSettleTransaction(input, client) {
+    const agentWallet = requiredPublicKey(input, 'agentWallet');
+    const depositorWallet = requiredPublicKey(input, 'depositorWallet');
+    const nonce = optionalBn(input, 'nonce', new BN(0));
+    const callsToSettle = requiredBn(input, 'callsToSettle');
+    const serviceHash = requiredBytes(input, 'serviceHash', 32);
+    const pdas = getEscrowPdas(client, agentWallet, depositorWallet, nonce);
+    const escrow = await fetchEscrowV2Nullable(client, pdas.escrowPda);
+    if (!escrow) {
+        throw new Error(`Escrow V2 PDA ${pdas.escrowPda.toBase58()} does not exist.`);
+    }
+    const tokenMint = publicKeyOrNull(escrow.tokenMint);
+    const pendingSettlementIndex = bnToBigInt(escrow.settlementIndex);
+    let pendingSettlementPda;
+    if (isDisputeWindowEscrow(escrow)) {
+        [pendingSettlementPda] = Pda.derivePendingSettlement(pdas.escrowPda, pendingSettlementIndex, client.programId);
+        const existing = await fetchPendingSettlementNullable(client, pendingSettlementPda);
+        if (existing) {
+            throw new Error(`Pending settlement ${pendingSettlementPda.toBase58()} already exists for settlementIndex=${pendingSettlementIndex.toString()}. Finalize or quarantine it before building another DisputeWindow settlement.`);
+        }
+    }
+    const coSigner = isCoSignedEscrow(escrow) ? publicKeyOrNull(escrow.coSigner) : optionalPublicKey(input, 'coSigner') ?? null;
+    if (isCoSignedEscrow(escrow) && !coSigner) {
+        throw new Error('CoSigned escrow requires coSigner in the escrow account.');
+    }
+    const remainingAccounts = buildEscrowSettlementRemainingAccounts({
+        tokenMint,
+        escrowPda: pdas.escrowPda,
+        agentWallet,
+        pendingSettlementPda,
+        coSigner,
+    });
+    const methods = client.program.methods;
+    const instruction = await methods.settleCallsV2(nonce, callsToSettle, serviceHash)
+        .accountsPartial({
+        wallet: agentWallet,
+        agent: pdas.agentPda,
+        agentStats: pdas.agentStats,
+        escrow: pdas.escrowPda,
+        systemProgram: SystemProgram.programId,
+    })
+        .remainingAccounts(remainingAccounts)
+        .instruction();
+    const tx = await serializeUnsignedTransaction(client, agentWallet, [instruction]);
+    return escrowBuilderResponse({
+        action: 'settle_calls_v2',
+        transactionBase64: tx.transactionBase64,
+        requiredSigner: agentWallet,
+        requiredSignerRole: 'agentWallet',
+        tokenMint,
+        blockhash: tx.blockhash,
+        lastValidBlockHeight: tx.lastValidBlockHeight,
+        accounts: {
+            agentWallet,
+            depositorWallet,
+            agentPda: pdas.agentPda,
+            agentStats: pdas.agentStats,
+            escrowPda: pdas.escrowPda,
+            pendingSettlementPda: pendingSettlementPda ?? null,
+            pendingSettlementIndex: pendingSettlementIndex.toString(),
+            callsToSettle,
+            serviceHash,
+            remainingAccounts: serializeAccountMetas(remainingAccounts),
+        },
+        security: {
+            settlementSecurity: isDisputeWindowEscrow(escrow) ? ESCROW_V2_DISPUTE_WINDOW_MODE : ESCROW_V2_COSIGNED_MODE,
+            coSigner,
+        },
+    });
+}
+async function buildEscrowFinalizeTransaction(input, client) {
+    const payerWallet = requiredPublicKey(input, 'payerWallet');
+    const agentWallet = requiredPublicKey(input, 'agentWallet');
+    const depositorWallet = requiredPublicKey(input, 'depositorWallet');
+    const nonce = optionalBn(input, 'nonce', new BN(0));
+    const settlementIndex = requiredBn(input, 'settlementIndex');
+    const pdas = getEscrowPdas(client, agentWallet, depositorWallet, nonce);
+    const [pendingSettlementPda] = Pda.derivePendingSettlement(pdas.escrowPda, bnToPdaSeed(settlementIndex, 'settlementIndex'), client.programId);
+    const escrow = await fetchEscrowV2Nullable(client, pdas.escrowPda);
+    if (!escrow) {
+        throw new Error(`Escrow V2 PDA ${pdas.escrowPda.toBase58()} does not exist.`);
+    }
+    const pending = await fetchPendingSettlementNullable(client, pendingSettlementPda);
+    if (!pending) {
+        throw new Error(`Pending settlement ${pendingSettlementPda.toBase58()} does not exist.`);
+    }
+    const tokenMint = publicKeyOrNull(escrow.tokenMint);
+    const remainingAccounts = buildSplRemainingAccounts(tokenMint, pdas.escrowPda, agentWallet);
+    const methods = client.program.methods;
+    const instruction = await methods.finalizeSettlement()
+        .accounts({
+        payer: payerWallet,
+        agentWallet,
+        escrow: pdas.escrowPda,
+        pendingSettlement: pendingSettlementPda,
+        agentStats: pdas.agentStats,
+    })
+        .remainingAccounts(remainingAccounts)
+        .instruction();
+    const tx = await serializeUnsignedTransaction(client, payerWallet, [instruction]);
+    return escrowBuilderResponse({
+        action: 'finalize_settlement',
+        transactionBase64: tx.transactionBase64,
+        requiredSigner: payerWallet,
+        requiredSignerRole: 'payer',
+        tokenMint,
+        blockhash: tx.blockhash,
+        lastValidBlockHeight: tx.lastValidBlockHeight,
+        accounts: {
+            payerWallet,
+            agentWallet,
+            depositorWallet,
+            escrowPda: pdas.escrowPda,
+            pendingSettlementPda,
+            settlementIndex,
+            releaseSlot: pending.releaseSlot,
+            remainingAccounts: serializeAccountMetas(remainingAccounts),
+        },
+    });
+}
+async function buildEscrowCloseTransaction(input, client) {
+    const depositorWallet = requiredPublicKey(input, 'depositorWallet');
+    const agentWallet = requiredPublicKey(input, 'agentWallet');
+    const nonce = optionalBn(input, 'nonce', new BN(0));
+    const pdas = getEscrowPdas(client, agentWallet, depositorWallet, nonce);
+    const escrow = await fetchEscrowV2Nullable(client, pdas.escrowPda);
+    if (!escrow) {
+        throw new Error(`Escrow V2 PDA ${pdas.escrowPda.toBase58()} does not exist.`);
+    }
+    if (bnToBigInt(escrow.balance) !== 0n || bnToBigInt(escrow.pendingAmount) !== 0n) {
+        throw new Error('Escrow cannot close until balance and pendingAmount are both zero.');
+    }
+    const methods = client.program.methods;
+    const instruction = await methods.closeEscrowV2()
+        .accounts({
+        depositor: depositorWallet,
+        escrow: pdas.escrowPda,
+        agentStats: pdas.agentStats,
+    })
+        .instruction();
+    const tx = await serializeUnsignedTransaction(client, depositorWallet, [instruction]);
+    return escrowBuilderResponse({
+        action: 'close_escrow_v2',
+        transactionBase64: tx.transactionBase64,
+        requiredSigner: depositorWallet,
+        requiredSignerRole: 'depositor',
+        tokenMint: publicKeyOrNull(escrow.tokenMint),
+        blockhash: tx.blockhash,
+        lastValidBlockHeight: tx.lastValidBlockHeight,
+        accounts: {
+            agentWallet,
+            depositorWallet,
+            escrowPda: pdas.escrowPda,
+            agentStats: pdas.agentStats,
+        },
+    });
+}
 /**
  * @name parseFeedbackArgs
  * @description Builds typed feedback args from MCP JSON input.
@@ -707,7 +2083,7 @@ function registerSapTool(server, client, definition) {
         inputSchema: definition.inputSchema,
     }, async (rawInput) => {
         try {
-            return ok(await definition.handler(asRecord(rawInput), client));
+            return ok(await definition.handler(asRecord(rawInput), client), definition.name);
         }
         catch (error) {
             logger.error(`SAP SDK tool failed: ${definition.name}`, { error });
@@ -723,7 +2099,7 @@ function buildSapSdkToolDescription(definition) {
 }
 function getSapSdkToolContext(name) {
     if (name === 'sap_register_agent') {
-        return 'SAP MCP context: This is the primary on-chain SAP agent registration tool for the connected profile signer. Use agentUri or metadataUri for off-chain metadata, including a Metaplex or DAS-backed identity document when the agent also has NFT/collection metadata. After registration, use sap_publish_tool_by_name for advertised MCP capabilities and AgentKit metaplex-nft_* tools for NFT collection, badge, or metadata workflows.';
+        return 'SAP MCP context: Do not use this raw SDK wrapper for production registration. The canonical registration path is sap_payments_register_agent, because it confirms the account, audits the protocol treasury fee, and fails closed when protocolComplete is false. Hosted accountless SAP MCP rejects direct registration before x402 payment because OOBE never custodies user wallet keys. Use sap_agent_identity_plan first, then sap_payments_register_agent with confirm:true.';
     }
     if (name === 'sap_update_agent') {
         return 'SAP MCP context: Use this after sap_register_agent to refresh name, description, capabilities, pricing, supported protocols, x402 endpoint, or metadataUri. For NFT-backed identity changes, update the Metaplex asset first when needed, then point the SAP agent metadataUri at the current metadata document.';
@@ -731,6 +2107,9 @@ function getSapSdkToolContext(name) {
     if (name.startsWith('sap_publish_tool') || name.startsWith('sap_update_tool')) {
         return 'SAP MCP context: Use tool registry writes to advertise concrete capabilities that this MCP can serve, including AgentKit bridge tools such as bridging_bridgeWormhole and Metaplex tools such as metaplex-nft_mintNFT. Publish only schemas and descriptions that match the actual MCP tool surface.';
     }
+    if (name.startsWith('sap_escrow_build_')) {
+        return 'SAP MCP context: Hosted-safe unsigned Escrow V2 builder. The output is not submitted and is not signed by hosted SAP MCP. Preview it, then call local sap_payments_finalize_transaction with submit:true and confirm:true. Never create temporary signing scripts or read keypair JSON.';
+    }
     if (name.startsWith('sap_discover') || name.startsWith('sap_list') || name.startsWith('sap_find') || name.startsWith('sap_fetch') || name.startsWith('sap_get') || name.startsWith('sap_is')) {
         return 'SAP MCP context: Read-only SAP SDK wrapper against the configured Solana RPC and SAP program. Use these reads to inspect current chain state before mutating registry, payment, reputation, memory, or tool accounts.';
     }
@@ -749,28 +2128,34 @@ function getSapSdkToolContext(name) {
     return 'SAP MCP context: Direct synapse-sap-sdk wrapper served by this MCP. Read tools return on-chain state; write tools require signer policy, configured RPC, and the active SAP profile.';
 }
 const agentTools = [
+    {
+        name: 'sap_protocol_invariants',
+        title: 'Get SAP Protocol Invariants',
+        description: 'Free read-only protocol invariant card for agents. Returns the current SAP program id, protocol treasury, source-level expected 0.1 SOL registration fee invariant, hosted write routing rules, local sap_payments routes, identity pipeline, and forbidden actions. Use this before SAP registry writes and whenever fee/treasury behavior is unclear.',
+        inputSchema: {},
+        handler: async () => buildSapProtocolInvariants(),
+    },
+    {
+        name: 'sap_agent_identity_plan',
+        title: 'Plan SAP Agent Identity',
+        description: 'Free read-only planner for SAP agent registration, profile/image updates, Metaplex/MPL Core identity linking, SNS linking, x402 pricing metadata, and post-write verification. Use this before sap_payments_register_agent or sap_payments_update_agent so agents know the exact local-signer route, metadata contract, forbidden actions, and protocol fee verification checklist. It does not touch chain and never signs.',
+        inputSchema: SAP_AGENT_IDENTITY_PLAN_INPUT_SCHEMA,
+        handler: async (input) => buildSapAgentIdentityPlan(input),
+    },
     {
         name: 'sap_register_agent',
-        title: 'Register SAP Agent',
-        description: 'Register the connected wallet as a SAP agent using SDK AgentModule.register.',
-        inputSchema: {
-            name: { type: 'string', description: 'Human-readable name for the SAP agent' },
-            description: { type: 'string', description: 'Detailed description of the agent\'s purpose and capabilities' },
-            capabilities: { type: 'array', description: 'Array of capability objects or strings identifying what the agent can do (e.g. "jupiter:swap")' },
-            pricing: { type: 'array', description: 'Array of pricing tier objects defining per-call costs, rate limits, and settlement terms' },
-            protocols: { type: 'array', items: { type: 'string' }, description: 'Array of protocol identifiers the agent supports (e.g. "jupiter", "drift")' },
-            agentId: { type: 'string', description: 'Optional unique agent identifier string' },
-            agentUri: { type: 'string', description: 'Optional URI to the agent\'s off-chain metadata or service endpoint' },
-            metadataUri: { type: 'string', description: 'Alias for agentUri — URI to off-chain agent metadata JSON' },
-            x402Endpoint: { type: 'string', description: 'Optional x402 payment endpoint URL for HTTP-based agent payments' },
+        title: 'Register SAP Agent (Raw SDK Deprecated)',
+        description: 'Deprecated raw SDK wrapper. Production registration must use sap_payments_register_agent so the local signer path confirms the account, verifies the 0.1 SOL protocol treasury fee invariant, and returns protocolComplete. Hosted accountless SAP MCP rejects this direct write before x402 payment.',
+        inputSchema: SAP_AGENT_REGISTER_INPUT_SCHEMA,
+        handler: async () => {
+            throw new Error('sap_register_agent raw SDK path is disabled for production safety. Call sap_agent_identity_plan, then sap_payments_register_agent with the same registration fields and confirm: true. success is true only when the agent account exists and protocolFee.status is verified.');
         },
-        handler: async (input, client) => ({ signature: await client.agent.register(parseRegisterAgentArgs(input)) }),
     },
     {
         name: 'sap_update_agent',
         title: 'Update SAP Agent',
-        description: 'Update the connected wallet SAP agent using SDK AgentModule.update.',
-        inputSchema: { type: 'object', additionalProperties: true, description: 'Object containing any combination of agent fields to update (name, description, capabilities, pricing, protocols, agentId, agentUri, x402Endpoint)' },
+        description: 'Local-signer-only: update the connected wallet SAP agent using SDK AgentModule.update. Hosted accountless SAP MCP rejects this direct write before x402 payment; hosted users should call sap_payments_update_agent from the local sap_payments bridge.',
+        inputSchema: SAP_AGENT_UPDATE_INPUT_SCHEMA,
         handler: async (input, client) => ({ signature: await client.agent.update(parseUpdateAgentArgs(input)) }),
     },
     {
@@ -813,7 +2198,7 @@ const agentTools = [
     {
         name: 'sap_get_agent',
         title: 'Get SAP Agent',
-        description: 'Fetch agent identity by owner wallet. If omitted, fetches the connected wallet agent.',
+        description: 'Free exact SAP agent identity read by owner wallet. If omitted, fetches the connected wallet agent. Use this before paid discovery when the wallet is known.',
         inputSchema: { wallet: { type: 'string', description: 'Solana public key of the agent owner wallet (base58). If omitted, uses the connected wallet.' } },
         handler: async (input, client) => {
             const wallet = optionalPublicKey(input, 'wallet');
@@ -825,7 +2210,7 @@ const agentTools = [
     {
         name: 'sap_get_agent_stats',
         title: 'Get SAP Agent Stats',
-        description: 'Fetch agent stats by agent PDA.',
+        description: 'Free exact SAP agent stats read by agent PDA. Use after sap_get_agent or sap_get_agent_profile when stats are needed.',
         inputSchema: { agentPda: { type: 'string', description: 'Agent PDA (base58) to fetch stats for' } },
         handler: async (input, client) => ({
             stats: await client.agent.fetchStatsNullable(requiredPublicKey(input, 'agentPda')),
@@ -834,7 +2219,7 @@ const agentTools = [
     {
         name: 'sap_get_global_state',
         title: 'Get SAP Global State',
-        description: 'Fetch the on-chain global registry through SDK AgentModule.fetchGlobalRegistry.',
+        description: 'Free compact global SAP registry state read. Use for initial orientation before paid network analytics.',
         inputSchema: {},
         handler: async (_input, client) => ({ state: await client.agent.fetchGlobalRegistry() }),
     },
@@ -847,124 +2232,118 @@ const discoveryTools = [
         inputSchema: {},
         handler: async (_input, client) => ({ overview: await client.discovery.getNetworkOverview() }),
     },
+    {
+        name: 'sap_agent_context',
+        title: 'Get SAP Agent Context',
+        description: 'Free one-shot SAP orientation context for agents. Use this when the user asks whether SAP MCP is connected, wants to understand an agent/wallet, or needs the next safe paid/write route. It combines exact reads or a compact directory page with routing guidance without triggering x402.',
+        inputSchema: {
+            wallet: {
+                type: 'string',
+                description: 'Optional exact owner wallet public key (base58). When supplied, returns the matching agent identity, PDA, active state, and hydrated profile when available.',
+            },
+            agentPda: {
+                type: 'string',
+                description: 'Optional exact SAP agent PDA (base58) for compact context lookup when the owner wallet is not known.',
+            },
+            query: {
+                type: 'string',
+                description: 'Optional text query for a free compact orientation search. Keep this narrow, for example "XONA" or "Solking".',
+            },
+            limit: {
+                type: 'number',
+                description: 'Maximum compact orientation rows to include when wallet is not supplied. Defaults to 10 and is capped at 20 to keep this tool free.',
+            },
+        },
+        handler: async (input, client) => buildSapAgentContext(input, client),
+    },
     {
         name: 'sap_get_agent_profile',
         title: 'Get SAP Agent Profile',
-        description: 'Fetch a hydrated SAP agent profile by owner wallet.',
+        description: 'Free exact SAP agent profile read by owner wallet. Use this for a known agent before paid discovery or enrichment.',
         inputSchema: { wallet: { type: 'string', description: 'Solana public key of the agent owner wallet (base58)' } },
         handler: async (input, client) => ({ profile: await client.discovery.getAgentProfile(requiredPublicKey(input, 'wallet')) }),
     },
     {
         name: 'sap_is_agent_active',
         title: 'Check SAP Agent Active',
-        description: 'Check if a wallet owns an active SAP agent.',
+        description: 'Free exact activity check for an owner wallet. Use this before paid discovery when the wallet is known.',
         inputSchema: { wallet: { type: 'string', description: 'Solana public key of the wallet to check for an active SAP agent (base58)' } },
         handler: async (input, client) => ({ active: await client.discovery.isAgentActive(requiredPublicKey(input, 'wallet')) }),
     },
     {
         name: 'sap_discover_agents',
         title: 'Discover SAP Agents',
-        description: 'Discover agents by protocol, capability, or capability list. Unfiltered global listing is not exposed by SDK v0.20.',
-        inputSchema: {
-            protocol: { type: 'string', description: 'Protocol identifier to filter agents by (e.g. "jupiter", "drift")' },
-            capability: { type: 'string', description: 'Single capability ID to filter agents by (e.g. "jupiter:swap")' },
-            capabilities: { type: 'array', items: { type: 'string' }, description: 'Array of capability IDs to filter agents by (requires at least one)' },
-            hydrate: { type: 'boolean', description: 'Whether to include full hydrated agent profiles in results (default: true)' },
-            limit: { type: 'number', description: 'Maximum number of agents to return (default: 50)' },
-        },
+        description: 'Paid hosted discovery for SAP agents. Search and filter the current on-chain AgentAccount directory by query, wallet, protocol, capability, x402 endpoint presence, and cursor pagination. Use this for targeted agent discovery before calling per-agent fetch tools.',
+        inputSchema: makeAgentDirectoryInputSchema(50),
         handler: async (input, client) => {
-            const hydrate = input.hydrate !== false;
-            const limit = optionalNumber(input, 'limit') ?? 50;
-            const capabilities = Array.isArray(input.capabilities)
-                ? input.capabilities.filter((item) => typeof item === 'string' && item.length > 0)
-                : [];
-            const protocol = optionalString(input, 'protocol');
+            const limit = Math.max(1, Math.min(optionalNumber(input, 'limit') ?? 50, 500));
             const capability = optionalString(input, 'capability');
-            if (protocol) {
-                const agents = await client.discovery.findAgentsByProtocol(protocol, { hydrate });
-                return { count: Math.min(agents.length, limit), agents: agents.slice(0, limit) };
-            }
-            if (capability) {
-                const agents = await client.discovery.findAgentsByCapability(capability, { hydrate });
-                return { count: Math.min(agents.length, limit), agents: agents.slice(0, limit) };
-            }
-            if (capabilities.length > 0) {
-                const agents = await client.discovery.findAgentsByCapabilities(capabilities, { hydrate });
-                return { count: Math.min(agents.length, limit), agents: agents.slice(0, limit) };
-            }
-            return {
-                count: 0,
-                agents: [],
-                overview: await client.discovery.getNetworkOverview(),
-                note: 'SDK v0.20 exposes filtered discovery, not unfiltered global agent enumeration. Provide protocol or capability.',
-            };
+            const capabilities = parseOptionalStringArray(input, 'capabilities');
+            return getFreshAgentDirectoryPage(client, {
+                includeInactive: input.includeInactive === true,
+                protocol: optionalString(input, 'protocol'),
+                capability,
+                capabilities,
+                capabilityMode: parseCapabilityMode(input),
+                query: optionalString(input, 'query'),
+                wallet: optionalString(input, 'wallet'),
+                agentPda: optionalString(input, 'agentPda'),
+                hasX402Endpoint: parseHasX402Endpoint(input),
+                limit,
+                offset: parseDirectoryOffset(input),
+                view: parseDirectoryView(input),
+                includeProtocolIndexes: input.includeProtocolIndexes === true,
+            });
         },
     },
     {
         name: 'sap_list_agents',
         title: 'List SAP Agents',
-        description: 'Compatibility alias for filtered SAP agent discovery. Requires protocol or capability. Use sap_list_all_agents for a global on-chain directory snapshot.',
-        inputSchema: {
-            protocol: { type: 'string', description: 'Protocol identifier to filter agents by (e.g. "jupiter", "drift")' },
-            capability: { type: 'string', description: 'Single capability ID to filter agents by (e.g. "jupiter:swap")' },
-            capabilities: { type: 'array', items: { type: 'string' }, description: 'Array of capability IDs to filter agents by (requires at least one)' },
-            hydrate: { type: 'boolean', description: 'Whether to include full hydrated agent profiles in results (default: true)' },
-            limit: { type: 'number', description: 'Maximum number of agents to return (default: 50)' },
+        description: 'Compact SAP agent orientation list. Free only when limit <= 20, view is compact, hydrate is false, and includeProtocolIndexes is false; larger or enriched pages are paid read-premium.',
+        inputSchema: makeAgentDirectoryInputSchema(20),
+        handler: async (input, client) => {
+            const limit = Math.max(1, Math.min(optionalNumber(input, 'limit') ?? 20, 500));
+            const capability = optionalString(input, 'capability');
+            return getFreshAgentDirectoryPage(client, {
+                includeInactive: input.includeInactive === true,
+                protocol: optionalString(input, 'protocol'),
+                capability,
+                capabilities: parseOptionalStringArray(input, 'capabilities'),
+                capabilityMode: parseCapabilityMode(input),
+                query: optionalString(input, 'query'),
+                wallet: optionalString(input, 'wallet'),
+                agentPda: optionalString(input, 'agentPda'),
+                hasX402Endpoint: parseHasX402Endpoint(input),
+                limit,
+                offset: parseDirectoryOffset(input),
+                view: parseDirectoryView(input),
+                includeProtocolIndexes: input.includeProtocolIndexes === true,
+            });
         },
-        handler: async (input, client) => discoveryTools[3].handler(input, client),
     },
     {
         name: 'sap_list_all_agents',
         title: 'List All SAP Agents',
-        description: 'Enumerate SAP AgentAccount PDAs directly from the on-chain program account set. Use this for current global directory requests such as "list all agents in the SAP ecosystem rn".',
-        inputSchema: {
-            limit: { type: 'number', description: 'Maximum rows to return. Defaults to 100; hard-capped at 500.' },
-            offset: { type: 'number', description: 'Zero-based pagination offset. Defaults to 0.' },
-            includeInactive: { type: 'boolean', description: 'Include inactive agents. Defaults to false.' },
-            protocol: { type: 'string', description: 'Optional protocol filter matched against agent profile protocols and protocol-index membership.' },
-            capability: { type: 'string', description: 'Optional capability ID filter such as jupiter:swap.' },
-            includeProtocolIndexes: { type: 'boolean', description: 'Include compact protocol index summaries. Defaults to true.' },
-        },
+        description: 'Paid hosted global SAP agent directory read. Enumerates current on-chain AgentAccount PDAs and supports query, wallet, protocol, capability, x402 endpoint filtering, compact/full views, and cursor pagination.',
+        inputSchema: makeAgentDirectoryInputSchema(100),
         handler: async (input, client) => {
             const limit = Math.max(1, Math.min(optionalNumber(input, 'limit') ?? 100, 500));
-            const offset = Math.max(0, optionalNumber(input, 'offset') ?? 0);
-            const includeInactive = input.includeInactive === true;
-            const includeProtocolIndexes = input.includeProtocolIndexes !== false;
-            const protocol = optionalString(input, 'protocol');
             const capability = optionalString(input, 'capability');
-            const accounts = getSapAnchorAccounts(client);
-            const [agentAccounts, statsAccounts, protocolIndexes, overview] = await Promise.all([
-                accounts.agentAccount.all(),
-                accounts.agentStats.all(),
-                accounts.protocolIndex.all(),
-                client.discovery.getNetworkOverview(),
-            ]);
-            const statsByAgent = new Map(statsAccounts.map(({ account }) => [account.agent.toBase58(), account]));
-            const indexedProtocolsByAgent = buildProtocolMembership(protocolIndexes);
-            const filteredAgents = agentAccounts
-                .map((account) => buildAgentDirectoryEntry(account, statsByAgent, indexedProtocolsByAgent))
-                .filter((entry) => matchesAgentDirectoryFilters(entry, { includeInactive, protocol, capability }))
-                .sort((left, right) => Number(right.createdAt) - Number(left.createdAt));
-            const page = filteredAgents.slice(offset, offset + limit);
-            return {
-                source: 'program.account.agentAccount.all + program.account.protocolIndex.all',
-                overview,
-                filters: {
-                    includeInactive,
-                    protocol: protocol ?? null,
-                    capability: capability ?? null,
-                },
-                totalEnumerated: filteredAgents.length,
-                totalAgentAccounts: agentAccounts.length,
-                activeAgentAccounts: agentAccounts.filter(({ account }) => account.isActive).length,
-                returned: page.length,
-                offset,
+            return getFreshAgentDirectoryPage(client, {
+                includeInactive: input.includeInactive === true,
+                protocol: optionalString(input, 'protocol'),
+                capability,
+                capabilities: parseOptionalStringArray(input, 'capabilities'),
+                capabilityMode: parseCapabilityMode(input),
+                query: optionalString(input, 'query'),
+                wallet: optionalString(input, 'wallet'),
+                agentPda: optionalString(input, 'agentPda'),
+                hasX402Endpoint: parseHasX402Endpoint(input),
                 limit,
-                truncated: offset + page.length < filteredAgents.length,
-                protocolIndexes: includeProtocolIndexes ? summarizeProtocolIndexes(protocolIndexes) : undefined,
-                agents: page,
-                note: 'This is global account enumeration, not filtered DiscoveryRegistry lookup. Use sap_discover_agents for protocol/capability search and sap_fetch_protocol_index when you already know a protocol ID.',
-            };
+                offset: parseDirectoryOffset(input),
+                view: parseDirectoryView(input),
+                includeProtocolIndexes: input.includeProtocolIndexes !== false,
+            });
         },
     },
     {
@@ -1228,24 +2607,66 @@ const paymentAndEscrowTools = [
     },
 ];
 const escrowV2Tools = [
+    {
+        name: 'sap_escrow_build_create_transaction',
+        title: 'Build SAP Escrow V2 Create Transaction',
+        description: 'Hosted-safe unsigned builder for create_escrow_v2. Use this from hosted SAP MCP, preview the result, then call local sap_payments_finalize_transaction with submit:true. The depositorWallet signs locally; keypair bytes never leave the user machine. Defaults to DisputeWindow settlementSecurity=2 and rejects SelfReport/0.',
+        inputSchema: escrowV2CreateBuilderInputSchema,
+        handler: buildEscrowCreateTransaction,
+    },
+    {
+        name: 'sap_escrow_build_deposit_transaction',
+        title: 'Build SAP Escrow V2 Deposit Transaction',
+        description: 'Hosted-safe unsigned builder for deposit_escrow_v2. Use this when a hosted workflow needs to add funds to an existing V2 escrow, then finalize locally with sap_payments_finalize_transaction.',
+        inputSchema: escrowV2DepositBuilderInputSchema,
+        handler: buildEscrowDepositTransaction,
+    },
+    {
+        name: 'sap_escrow_build_settle_transaction',
+        title: 'Build SAP Escrow V2 Settlement Transaction',
+        description: 'Hosted-safe unsigned builder for settle_calls_v2. The agent owner wallet signs locally. DisputeWindow escrows create a pending settlement PDA; CoSigned escrows require the coSigner account when configured.',
+        inputSchema: escrowV2SettleBuilderInputSchema,
+        handler: buildEscrowSettleTransaction,
+    },
+    {
+        name: 'sap_escrow_build_finalize_transaction',
+        title: 'Build SAP Escrow V2 Finalize Transaction',
+        description: 'Hosted-safe unsigned builder for finalize_settlement. Use after the dispute window has elapsed and a pending settlement exists; any payerWallet can locally sign to crank finalization.',
+        inputSchema: escrowV2FinalizeBuilderInputSchema,
+        handler: buildEscrowFinalizeTransaction,
+    },
+    {
+        name: 'sap_escrow_build_withdraw_transaction',
+        title: 'Build SAP Escrow V2 Withdraw Transaction',
+        description: 'Hosted-safe unsigned builder for withdraw_escrow_v2. The depositor signs locally and can only withdraw unlocked balance after pending amounts are excluded.',
+        inputSchema: escrowV2WithdrawBuilderInputSchema,
+        handler: buildEscrowWithdrawTransaction,
+    },
+    {
+        name: 'sap_escrow_build_close_transaction',
+        title: 'Build SAP Escrow V2 Close Transaction',
+        description: 'Hosted-safe unsigned builder for close_escrow_v2. The depositor signs locally; the builder refuses to close until balance and pendingAmount are both zero.',
+        inputSchema: escrowV2CloseBuilderInputSchema,
+        handler: buildEscrowCloseTransaction,
+    },
     {
         name: 'sap_create_escrow_v2',
         title: 'Create SAP Escrow V2',
-        description: 'Create a V2 escrow using SDK EscrowV2Module.create. Defaults to DisputeWindow settlementSecurity=2; SelfReport/0 is rejected.',
+        description: 'Local-signer-only direct V2 escrow creation using SDK EscrowV2Module.create. Defaults to DisputeWindow settlementSecurity=2; SelfReport/0 is rejected. Hosted accountless SAP MCP rejects this before x402 payment; hosted users should call sap_escrow_build_create_transaction and finalize locally.',
         inputSchema: escrowV2CreateInputSchema,
         handler: async (input, client) => ({ signature: await client.escrowV2.create(requiredPublicKey(input, 'agentWallet'), parseEscrowV2Args(input)) }),
     },
     {
         name: 'sap_deposit_escrow_v2',
         title: 'Deposit SAP Escrow V2',
-        description: 'Deposit funds into a V2 escrow.',
+        description: 'Local-signer-only direct deposit into a V2 escrow. Hosted users should call sap_escrow_build_deposit_transaction and finalize locally.',
         inputSchema: { agentWallet: { type: 'string', description: 'Agent wallet public key (base58)' }, nonce: { type: 'string', description: 'Escrow nonce (as a decimal string, default: 0)' }, amount: { type: 'string', description: `Deposit amount as a decimal string. ${ESCROW_AMOUNT_DESCRIPTION}` } },
         handler: async (input, client) => ({ signature: await client.escrowV2.deposit(requiredPublicKey(input, 'agentWallet'), optionalBn(input, 'nonce', new BN(0)), requiredBn(input, 'amount')) }),
     },
     {
         name: 'sap_settle_escrow_v2',
         title: 'Settle SAP Escrow V2',
-        description: 'Settle calls against a V2 escrow.',
+        description: 'Local-signer-only direct settlement against a V2 escrow. Hosted users should call sap_escrow_build_settle_transaction and finalize locally.',
         inputSchema: { depositorWallet: { type: 'string', description: 'Depositor wallet public key (base58)' }, nonce: { type: 'string', description: 'Escrow nonce (as a decimal string, default: 0)' }, callsToSettle: { type: 'string', description: 'Number of calls to settle (as a decimal string)' }, serviceHash: { type: 'array', description: '32-byte service hash as a byte array, hex string, or base64 string' } },
         handler: async (input, client) => ({
             signature: await client.escrowV2.settle(requiredPublicKey(input, 'depositorWallet'), optionalBn(input, 'nonce', new BN(0)), requiredBn(input, 'callsToSettle'), requiredBytes(input, 'serviceHash', 32)),
@@ -1263,7 +2684,7 @@ const escrowV2Tools = [
     {
         name: 'sap_finalize_settlement_v2',
         title: 'Finalize SAP Escrow V2 Settlement',
-        description: 'Finalize a V2 pending settlement.',
+        description: 'Local-signer-only direct finalization of a V2 pending settlement. Hosted users should call sap_escrow_build_finalize_transaction and finalize locally.',
         inputSchema: { agentWallet: { type: 'string', description: 'Agent wallet public key (base58)' }, depositorWallet: { type: 'string', description: 'Depositor wallet public key (base58)' }, nonce: { type: 'string', description: 'Escrow nonce (as a decimal string, default: 0)' }, settlementIndex: { type: 'string', description: 'Settlement index to finalize (as a decimal string)' } },
         handler: async (input, client) => ({
             signature: await client.escrowV2.finalizeSettlement(requiredPublicKey(input, 'agentWallet'), requiredPublicKey(input, 'depositorWallet'), optionalBn(input, 'nonce', new BN(0)), requiredBn(input, 'settlementIndex')),
@@ -1281,14 +2702,14 @@ const escrowV2Tools = [
     {
         name: 'sap_withdraw_escrow_v2',
         title: 'Withdraw SAP Escrow V2',
-        description: 'Withdraw funds from a V2 escrow.',
+        description: 'Local-signer-only direct withdrawal from a V2 escrow. Hosted users should call sap_escrow_build_withdraw_transaction and finalize locally.',
         inputSchema: { agentWallet: { type: 'string', description: 'Agent wallet public key (base58)' }, nonce: { type: 'string', description: 'Escrow nonce (as a decimal string, default: 0)' }, amount: { type: 'string', description: `Withdrawal amount as a decimal string. ${ESCROW_AMOUNT_DESCRIPTION}` } },
         handler: async (input, client) => ({ signature: await client.escrowV2.withdraw(requiredPublicKey(input, 'agentWallet'), optionalBn(input, 'nonce', new BN(0)), requiredBn(input, 'amount')) }),
     },
     {
         name: 'sap_close_escrow_v2',
         title: 'Close SAP Escrow V2',
-        description: 'Close a V2 escrow.',
+        description: 'Local-signer-only direct close for an empty V2 escrow. Hosted users should call sap_escrow_build_close_transaction and finalize locally.',
         inputSchema: { agentWallet: { type: 'string', description: 'Agent wallet public key (base58)' }, nonce: { type: 'string', description: 'Escrow nonce (as a decimal string, default: 0)' } },
         handler: async (input, client) => ({ signature: await client.escrowV2.close(requiredPublicKey(input, 'agentWallet'), optionalBn(input, 'nonce', new BN(0))) }),
     },
@@ -1530,7 +2951,7 @@ const sapToolGroups = [
 ];
 /**
  * @name registerSapSdkTools
- * @description Registers production SAP SDK-backed tools using the public SDK v0.20 client surface.
+ * @description Registers production SAP SDK-backed tools using the current public SDK v1.0.x client surface.
  */
 export function registerSapSdkTools(server, _context) {
     logger.debug('Registering SAP SDK tools');