@oobe-protocol-labs/sap-mcp-server 0.7.3 → 0.8.0

package/assets/logos/smithery.svg

@@ -0,0 +1,11 @@
+<svg width="135" height="159" viewBox="0 0 135 159" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M31.3508 58.4053H0V78.9492C0 90.8872 9.67578 100.563 21.6138 100.563H42.1577V69.2122C42.1577 63.2432 37.3198 58.4053 31.3508 58.4053Z" fill="#FF5601"/>
+<path d="M46.2327 69.2122V100.563H77.5835C83.5525 100.563 88.3904 95.7251 88.3904 89.7561V58.4053H57.0396C51.0706 58.4053 46.2327 63.2432 46.2327 69.2122Z" fill="#FF5601"/>
+<path d="M113.013 58.4053H92.4695V89.7561C92.4695 95.7251 97.3074 100.563 103.276 100.563H134.627V80.0191C134.627 68.0811 124.951 58.4053 113.013 58.4053Z" fill="#FF5601"/>
+<path d="M0.000244141 37.5535V54.351H31.3511C37.3201 54.351 42.158 49.5131 42.158 43.5441V6.01534C40.9332 5.97572 39.6616 5.9541 38.3323 5.9541C17.9865 5.9541 0.000244141 15.9001 0.000244141 37.5535Z" fill="#FF5601"/>
+<path d="M46.2327 43.5332C46.2327 49.5022 51.0706 54.3401 57.0396 54.3401H88.3904V14.4735C71.0993 12.8596 64.1109 7.47418 46.2327 6.21338V43.5368V43.5332Z" fill="#FF5601"/>
+<path d="M98.8636 14.9351C96.5833 14.9351 94.4616 14.8775 92.4695 14.773V54.3443H113.013C124.951 54.3443 134.627 44.6685 134.627 32.7305V0C127.945 8.91209 116.097 14.9351 98.8636 14.9351Z" fill="#FF5601"/>
+<path d="M35.7697 144.068C38.05 144.068 40.1718 144.126 42.1638 144.23V104.659H21.6199C9.68188 104.659 0.00610352 114.335 0.00610352 126.273V159C6.68837 150.088 18.5363 144.065 35.7733 144.065L35.7697 144.068Z" fill="#FF5601"/>
+<path d="M88.3904 115.466C88.3904 109.497 83.5525 104.659 77.5835 104.659H46.2327V144.529C63.5237 146.143 70.5122 151.529 88.3904 152.79V115.466Z" fill="#FF5601"/>
+<path d="M134.627 121.5V104.659H103.276C97.3074 104.659 92.4695 109.497 92.4695 115.466V152.995C93.6943 153.034 94.9659 153.052 96.2951 153.052C116.63 153.052 134.606 143.121 134.627 121.496V121.5Z" fill="#FF5601"/>
+</svg>

package/dist/config/mcp-client-injection.d.ts

@@ -80,13 +80,22 @@ export interface ManualMcpClientSnippet {
 }
 /**
  * @name McpClientAddonInstallResult
- * @description Files written when the wizard installs a local client addon bundle.
+ * @description Files written when the wizard installs a local payment bridge reference bundle.
  */
 export interface McpClientAddonInstallResult {
     addonId: 'x402-paid-call';
     targetDir: string;
     files: string[];
 }
+/**
+ * @name HostedPaymentBridgeResolution
+ * @description Result produced after building and auto-resolving hosted SAP MCP plus local sap_payments config.
+ */
+export interface HostedPaymentBridgeResolution {
+    nextContent: string;
+    hadSapConfig: boolean;
+    resolvedIssues: string[];
+}
 type SupportedPlatform = NodeJS.Platform;
 /**
  * @name HOSTED_SAP_MCP_URL
@@ -115,12 +124,12 @@ export declare function createNpxCodexServerConfig(): McpServerInjectionConfig;
 export declare function createNpxPaymentBridgeServerConfig(): McpServerInjectionConfig;
 /**
  * @name createX402PaidCallAddonSnippets
- * @description Builds manual plugin/addon snippets for clients that can call a local x402 payment helper.
+ * @description Builds manual snippets for clients that can call the native local SAP MCP payment bridge.
  */
 export declare function createX402PaidCallAddonSnippets(): ManualMcpClientSnippet[];
 /**
  * @name installX402PaidCallAddon
- * @description Installs a portable local addon bundle with manifest and client snippets.
+ * @description Installs a portable local reference bundle with manifest and client snippets for bridge repair/custom clients.
  */
 export declare function installX402PaidCallAddon(targetDir?: string): McpClientAddonInstallResult;
 /**
@@ -138,11 +147,21 @@ export declare function discoverMcpClientTargets(homeDir?: string, platform?: Su
  * @description Detects stale SAP MCP paths and hardcoded environment overrides.
  */
 export declare function findLegacySignals(content: string): string[];
+/**
+ * @name validateHostedPaymentBridgeContent
+ * @description Verifies that a runtime config contains both hosted SAP MCP and the local sap_payments bridge.
+ */
+export declare function validateHostedPaymentBridgeContent(target: McpClientTarget, content: string, platform?: SupportedPlatform): string[];
+/**
+ * @name resolveHostedPaymentBridgeContent
+ * @description Builds hosted SAP MCP plus local sap_payments config and auto-repairs stale runtime config.
+ */
+export declare function resolveHostedPaymentBridgeContent(target: McpClientTarget, content: string, platform?: SupportedPlatform): HostedPaymentBridgeResolution;
 /**
  * @name buildCodexHostedPaymentBridgeContent
  * @description Builds Codex TOML with hosted SAP MCP plus a local sap_payments x402 bridge.
  */
-export declare function buildCodexHostedPaymentBridgeContent(content: string, hostedUrl?: string): {
+export declare function buildCodexHostedPaymentBridgeContent(content: string, hostedUrl?: string, platform?: SupportedPlatform): {
     nextContent: string;
     hadSapConfig: boolean;
 };
@@ -150,12 +169,12 @@ export declare function buildCodexHostedPaymentBridgeContent(content: string, ho
  * @name installCodexHostedPaymentBridgeConfig
  * @description Writes Codex config.toml with hosted SAP MCP and the local x402 payment bridge.
  */
-export declare function installCodexHostedPaymentBridgeConfig(homeDir?: string): McpClientInjectionResult;
+export declare function installCodexHostedPaymentBridgeConfig(homeDir?: string, platform?: SupportedPlatform): McpClientInjectionResult;
 /**
  * @name buildHostedPaymentBridgeContent
  * @description Builds runtime-specific config with hosted SAP MCP and local x402 bridge.
  */
-export declare function buildHostedPaymentBridgeContent(target: McpClientTarget, content: string): {
+export declare function buildHostedPaymentBridgeContent(target: McpClientTarget, content: string, platform?: SupportedPlatform): {
     nextContent: string;
     hadSapConfig: boolean;
 };
@@ -163,7 +182,7 @@ export declare function buildHostedPaymentBridgeContent(target: McpClientTarget,
  * @name installHostedPaymentBridgeConfig
  * @description Installs or repairs hosted SAP MCP plus local x402 bridge config for a concrete runtime target.
  */
-export declare function installHostedPaymentBridgeConfig(target: McpClientTarget): McpClientInjectionResult;
+export declare function installHostedPaymentBridgeConfig(target: McpClientTarget, platform?: SupportedPlatform): McpClientInjectionResult;
 /**
  * @name installHostedPaymentBridgeConfigs
  * @description Installs payment bridge configs for all selected runtime ids and detected/create-capable targets.

package/dist/config/mcp-client-injection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mcp-client-injection.d.ts","sourceRoot":"","sources":["../../src/config/mcp-client-injection.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"mcp-client-injection.d.ts","sourceRoot":"","sources":["../../src/config/mcp-client-injection.ts"],"names":[],"mappings":"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"}

package/dist/config/mcp-client-injection.js

@@ -1,15 +1,12 @@
 import { existsSync, mkdirSync, readFileSync, readdirSync, writeFileSync } from 'fs';
 import { homedir } from 'os';
 import { dirname, join } from 'path';
+import { MCP_SERVER_VERSION } from '../core/constants.js';
 const SAP_SERVER_NAME = 'sap';
 const SAP_PAYMENT_BRIDGE_SERVER_NAME = 'sap_payments';
 const X402_PAID_CALL_ADDON_ID = 'x402-paid-call';
 const X402_PAID_CALL_COMMAND = 'sap-mcp-x402-paid-call';
-const X402_PAYMENT_BRIDGE_TOOLS = [
-    'sap_x402_paid_call',
-    'sap_profile_current',
-    'sap_x402_estimate_cost',
-];
+const SAP_MCP_NPM_PACKAGE = `@oobe-protocol-labs/sap-mcp-server@${MCP_SERVER_VERSION}`;
 /**
  * @name HOSTED_SAP_MCP_URL
  * @description Public OOBE hosted SAP MCP Streamable HTTP endpoint used in manual client setup snippets.
@@ -24,6 +21,13 @@ const LEGACY_ENV_KEYS = new Set([
     'SAP_MCP_WALLET_PATH',
     'SAP_NETWORK',
 ]);
+/**
+ * @name getNpxCommand
+ * @description Returns the platform-specific npx executable name used by MCP clients.
+ */
+function getNpxCommand(platform) {
+    return platform === 'win32' ? 'npx.cmd' : 'npx';
+}
 /**
  * @name isRecord
  * @description Narrows unknown data to a JSON-like object.
@@ -169,13 +173,20 @@ export function createManualMcpJsonSnippets(canonical, hostedUrl = HOSTED_SAP_MC
  * @description Builds a portable Codex stdio config that works without a source checkout.
  */
 export function createNpxCodexServerConfig() {
-    const command = process.platform === 'win32' ? 'npx.cmd' : 'npx';
+    return createNpxCodexServerConfigForPlatform(process.platform);
+}
+/**
+ * @name createNpxCodexServerConfigForPlatform
+ * @description Builds a portable Codex stdio config for a specific host platform.
+ */
+function createNpxCodexServerConfigForPlatform(platform) {
+    const command = getNpxCommand(platform);
     return {
         command,
         args: [
             '--yes',
             '--package',
-            '@oobe-protocol-labs/sap-mcp-server',
+            SAP_MCP_NPM_PACKAGE,
             'sap-mcp-server',
         ],
         env: {
@@ -189,25 +200,33 @@ export function createNpxCodexServerConfig() {
  * @description Builds a portable local stdio MCP config that exposes only x402 payment helper tools.
  */
 export function createNpxPaymentBridgeServerConfig() {
-    const command = process.platform === 'win32' ? 'npx.cmd' : 'npx';
+    return createNpxPaymentBridgeServerConfigForPlatform(process.platform);
+}
+/**
+ * @name createNpxPaymentBridgeServerConfigForPlatform
+ * @description Builds the local sap_payments bridge command for a specific host platform.
+ */
+function createNpxPaymentBridgeServerConfigForPlatform(platform) {
+    const command = getNpxCommand(platform);
     return {
         command,
         args: [
             '--yes',
             '--package',
-            '@oobe-protocol-labs/sap-mcp-server',
+            SAP_MCP_NPM_PACKAGE,
             'sap-mcp-server',
         ],
         env: {
             SAP_MCP_ALLOW_ENV_CONFIG_OVERRIDE: 'false',
-            SAP_ALLOWED_TOOLS: X402_PAYMENT_BRIDGE_TOOLS.join(','),
+            SAP_MCP_PAYMENTS_BRIDGE_ONLY: 'true',
+            SAP_ALLOWED_TOOLS: 'all',
             SAP_LOG_LEVEL: 'info',
         },
     };
 }
 /**
  * @name createX402PaidCallAddonSnippets
- * @description Builds manual plugin/addon snippets for clients that can call a local x402 payment helper.
+ * @description Builds manual snippets for clients that can call the native local SAP MCP payment bridge.
  */
 export function createX402PaidCallAddonSnippets() {
     const paymentBridge = createNpxPaymentBridgeServerConfig();
@@ -219,12 +238,12 @@ export function createX402PaidCallAddonSnippets() {
         },
         {
             title: 'Claude Code Payment Bridge Commands',
-            description: 'Use the official Claude Code MCP CLI flow: add hosted SAP MCP over HTTP, then add this local stdio bridge for x402 payment retries.',
+            description: 'Use the official Claude Code MCP CLI flow: add hosted SAP MCP over HTTP, then add this native local stdio bridge for x402 payment retries.',
             content: [
                 `claude mcp add --transport http ${SAP_SERVER_NAME} ${HOSTED_SAP_MCP_URL}`,
                 `claude mcp add --transport stdio ${SAP_PAYMENT_BRIDGE_SERVER_NAME} -- ${paymentBridge.command} ${paymentBridge.args.map(shellQuote).join(' ')}`,
                 '',
-                'Then ask Claude to call sap_payments.sap_x402_paid_call for hosted paid/write SAP MCP tools.',
+                'Then ask Claude to call sap_payments.sap_payments_call_paid_tool for hosted paid/write SAP MCP tools.',
                 '',
             ].join('\n'),
         },
@@ -243,7 +262,7 @@ export function createX402PaidCallAddonSnippets() {
         },
         {
             title: 'Hermes Payment Bridge YAML',
-            description: 'Use this inside Hermes profile config.yaml under mcp_servers when Hermes does not already have the x402 plugin installed.',
+            description: 'Use this inside Hermes profile config.yaml under mcp_servers when Hermes cannot natively replay hosted x402 challenges.',
             content: [
                 'mcp_servers:',
                 `  ${SAP_SERVER_NAME}:`,
@@ -287,8 +306,8 @@ export function createX402PaidCallAddonSnippets() {
             }),
         },
         {
-            title: 'Hermes Addon: x402_paid_call',
-            description: 'Use this concept for Hermes plugin/addon registries that expose local command-backed tools.',
+            title: 'Hermes Command Wrapper: x402_paid_call',
+            description: 'Legacy fallback for Hermes plugin/addon registries that expose local command-backed tools. Prefer the sap_payments MCP bridge when possible.',
             content: formatJson({
                 plugins: {
                     x402_paid_call: {
@@ -303,8 +322,8 @@ export function createX402PaidCallAddonSnippets() {
             }),
         },
         {
-            title: 'Claude/Codex/OpenClaw Addon Command',
-            description: 'Use this command from a local tool/plugin wrapper when the client supports command-backed addons.',
+            title: 'Claude/Codex/OpenClaw Command Fallback',
+            description: 'Use this command only from a custom local wrapper when the client cannot add the sap_payments MCP bridge.',
             content: [
                 `${X402_PAID_CALL_COMMAND} \\`,
                 '  --tool sap_list_all_agents \\',
@@ -316,9 +335,9 @@ export function createX402PaidCallAddonSnippets() {
         },
         {
             title: 'Local MCP Tool Alternative',
-            description: 'When the local SAP MCP stdio server is installed, agents can call sap_x402_paid_call instead of using a runtime-specific plugin.',
+            description: 'When the local SAP MCP stdio bridge is installed, agents should call sap_payments_call_paid_tool. The sap_x402_paid_call alias is legacy.',
             content: formatJson({
-                name: 'sap_x402_paid_call',
+                name: 'sap_payments_call_paid_tool',
                 arguments: {
                     toolName: 'sap_list_all_agents',
                     arguments: { limit: 5 },
@@ -331,7 +350,7 @@ export function createX402PaidCallAddonSnippets() {
 }
 /**
  * @name installX402PaidCallAddon
- * @description Installs a portable local addon bundle with manifest and client snippets.
+ * @description Installs a portable local reference bundle with manifest and client snippets for bridge repair/custom clients.
  */
 export function installX402PaidCallAddon(targetDir = join(homedir(), '.config', 'mcp-sap', 'addons', X402_PAID_CALL_ADDON_ID)) {
     mkdirSync(targetDir, { recursive: true, mode: 0o700 });
@@ -341,11 +360,11 @@ export function installX402PaidCallAddon(targetDir = join(homedir(), '.config',
     const files = [manifestPath, readmePath, snippetsPath];
     writeFileSync(manifestPath, formatJson({
         id: X402_PAID_CALL_ADDON_ID,
-        name: 'SAP MCP x402 Paid Call',
+        name: 'SAP MCP Local Payment Bridge',
         command: X402_PAID_CALL_COMMAND,
         toolName: 'x402_paid_call',
         localMcpToolName: 'sap_x402_paid_call',
-        description: 'Local payment helper for hosted SAP MCP paid tools. It signs x402 payment payloads with the user-controlled SAP MCP profile signer.',
+        description: 'Native local SAP MCP payment bridge reference bundle for hosted paid tools. The sap_payments MCP server signs x402 payloads with the user-controlled SAP MCP profile signer.',
         security: {
             readsLocalKeypairFileForSigning: true,
             printsKeypairBytes: false,
@@ -355,17 +374,17 @@ export function installX402PaidCallAddon(targetDir = join(homedir(), '.config',
         },
     }), { encoding: 'utf-8', mode: 0o600 });
     writeFileSync(readmePath, [
-        '# SAP MCP x402 Paid Call Addon',
+        '# SAP MCP Local Payment Bridge',
         '',
-        'This addon lets local agent runtimes pay hosted SAP MCP x402 tool challenges without giving OOBE or the hosted server user keypair bytes.',
+        'This reference bundle documents the native local SAP MCP payment bridge for hosted x402 tool challenges. Runtime configs should prefer a local `sap_payments` MCP server exposing `sap_payments_call_paid_tool`.',
         '',
-        'Use the command directly from a runtime-specific plugin wrapper:',
+        'Legacy command fallback for custom wrappers:',
         '',
         '```bash',
         `${X402_PAID_CALL_COMMAND} --tool sap_list_all_agents --arguments '{"limit":5}' --max-usd 0.02 --confirm`,
         '```',
         '',
-        'Or call the local SAP MCP tool `sap_x402_paid_call` when local stdio SAP MCP is available.',
+        'Prefer calling the local SAP MCP tool `sap_payments_call_paid_tool` when the `sap_payments` MCP bridge is available. `sap_x402_paid_call` remains a backward-compatible alias.',
         '',
         'Security rules:',
         '',
@@ -565,10 +584,10 @@ function hostedJsonServerConfig(target) {
  * @name buildHostedPaymentBridgeJsonContent
  * @description Builds JSON config with hosted SAP MCP plus local x402 payment bridge.
  */
-function buildHostedPaymentBridgeJsonContent(content, target) {
+function buildHostedPaymentBridgeJsonContent(content, target, platform) {
     const parsed = content.trim() ? JSON.parse(content) : {};
     const root = isRecord(parsed) ? parsed : {};
-    const paymentBridge = createNpxPaymentBridgeServerConfig();
+    const paymentBridge = createNpxPaymentBridgeServerConfigForPlatform(platform);
     if (target.id === 'openclaw') {
         return buildOpenClawHostedPaymentBridgeJsonContent(root, paymentBridge);
     }
@@ -742,9 +761,9 @@ function replaceYamlSapBlock(content, canonical) {
  * @name replaceYamlHostedPaymentBridgeBlocks
  * @description Replaces or appends hosted SAP MCP plus local x402 bridge blocks under mcp_servers.
  */
-function replaceYamlHostedPaymentBridgeBlocks(content) {
+function replaceYamlHostedPaymentBridgeBlocks(content, platform) {
     const lines = content.split(/\r?\n/);
-    const paymentBridge = createNpxPaymentBridgeServerConfig();
+    const paymentBridge = createNpxPaymentBridgeServerConfigForPlatform(platform);
     const replacement = [
         ...yamlHostedServerBlock(SAP_SERVER_NAME, 2),
         ...yamlCommandServerBlock(SAP_PAYMENT_BRIDGE_SERVER_NAME, paymentBridge, 2),
@@ -786,9 +805,9 @@ function replaceYamlHostedPaymentBridgeBlocks(content) {
  * @name replaceOpenClawYamlHostedPaymentBridgeBlocks
  * @description Replaces or appends hosted SAP MCP plus local x402 bridge blocks under OpenClaw `mcp.servers`.
  */
-function replaceOpenClawYamlHostedPaymentBridgeBlocks(content) {
+function replaceOpenClawYamlHostedPaymentBridgeBlocks(content, platform) {
     const lines = content.split(/\r?\n/);
-    const paymentBridge = createNpxPaymentBridgeServerConfig();
+    const paymentBridge = createNpxPaymentBridgeServerConfigForPlatform(platform);
     const replacement = [
         ...yamlHostedServerBlock(SAP_SERVER_NAME, 4),
         ...yamlCommandServerBlock(SAP_PAYMENT_BRIDGE_SERVER_NAME, paymentBridge, 4),
@@ -869,12 +888,11 @@ function hostedTomlServerBlock(hosted) {
  */
 function codexPaymentBridgeTomlBlock(canonical) {
     const args = `[${canonical.args.map((arg) => JSON.stringify(arg)).join(', ')}]`;
-    const enabledTools = `[${X402_PAYMENT_BRIDGE_TOOLS.map((tool) => JSON.stringify(tool)).join(', ')}]`;
     const lines = [
         `[mcp_servers.${SAP_PAYMENT_BRIDGE_SERVER_NAME}]`,
         `command = ${JSON.stringify(canonical.command)}`,
         `args = ${args}`,
-        `enabled_tools = ${enabledTools}`,
+        'startup_timeout_sec = 300',
         'tool_timeout_sec = 300',
     ];
     lines.push('');
@@ -884,6 +902,108 @@ function codexPaymentBridgeTomlBlock(canonical) {
     }
     return lines.join('\n');
 }
+/**
+ * @name getCodexMcpServerSection
+ * @description Extracts a Codex MCP server section and nested env subsection for targeted validation.
+ */
+function getCodexMcpServerSection(content, serverName) {
+    const lines = content.split(/\r?\n/);
+    const start = lines.findIndex((line) => line.trim() === `[mcp_servers.${serverName}]`);
+    if (start === -1) {
+        return '';
+    }
+    let end = start + 1;
+    while (end < lines.length) {
+        const line = lines[end]?.trim() ?? '';
+        if (line.startsWith('[mcp_servers.') && !line.startsWith(`[mcp_servers.${serverName}.`)) {
+            break;
+        }
+        if (line.startsWith('[') && !line.startsWith(`[mcp_servers.${serverName}.`)) {
+            break;
+        }
+        end += 1;
+    }
+    return lines.slice(start, end).join('\n');
+}
+/**
+ * @name validateHostedPaymentBridgeContent
+ * @description Verifies that a runtime config contains both hosted SAP MCP and the local sap_payments bridge.
+ */
+export function validateHostedPaymentBridgeContent(target, content, platform = process.platform) {
+    const issues = [];
+    const expectedNpx = getNpxCommand(platform);
+    if (!content.includes(SAP_PAYMENT_BRIDGE_SERVER_NAME)) {
+        issues.push('Missing local sap_payments MCP bridge.');
+    }
+    if (!content.includes(HOSTED_SAP_MCP_URL)) {
+        issues.push(`Missing hosted SAP MCP URL ${HOSTED_SAP_MCP_URL}.`);
+    }
+    if (!content.includes('SAP_MCP_ALLOW_ENV_CONFIG_OVERRIDE')) {
+        issues.push('Missing SAP_MCP_ALLOW_ENV_CONFIG_OVERRIDE=false in local bridge env.');
+    }
+    const bridgeOnlyEnabled = content.includes('SAP_MCP_PAYMENTS_BRIDGE_ONLY = "true"')
+        || content.includes('"SAP_MCP_PAYMENTS_BRIDGE_ONLY": "true"')
+        || content.includes('SAP_MCP_PAYMENTS_BRIDGE_ONLY: "true"')
+        || content.includes('SAP_MCP_PAYMENTS_BRIDGE_ONLY: true');
+    if (!bridgeOnlyEnabled) {
+        issues.push('Missing SAP_MCP_PAYMENTS_BRIDGE_ONLY=true for the local payment bridge process.');
+    }
+    if (!content.includes('SAP_ALLOWED_TOOLS')) {
+        issues.push('Missing SAP_ALLOWED_TOOLS allow-list for the local payment bridge.');
+    }
+    if (!content.includes(SAP_MCP_NPM_PACKAGE)) {
+        issues.push(`Local sap_payments bridge must pin ${SAP_MCP_NPM_PACKAGE}; unpinned npx can download an older npm latest.`);
+    }
+    const allowsAllTools = content.includes('SAP_ALLOWED_TOOLS = "all"')
+        || content.includes('"SAP_ALLOWED_TOOLS": "all"')
+        || content.includes('SAP_ALLOWED_TOOLS: all')
+        || content.includes('SAP_ALLOWED_TOOLS: "all"');
+    if (!allowsAllTools) {
+        issues.push('SAP_ALLOWED_TOOLS must be all because the bridge process is already payments-only.');
+    }
+    if (target.id === 'codex') {
+        if (!content.includes(`[mcp_servers.${SAP_SERVER_NAME}]`)) {
+            issues.push('Missing Codex [mcp_servers.sap] hosted server block.');
+        }
+        if (!content.includes(`[mcp_servers.${SAP_PAYMENT_BRIDGE_SERVER_NAME}]`)) {
+            issues.push('Missing Codex [mcp_servers.sap_payments] local bridge block.');
+        }
+        if (!content.includes(`command = ${JSON.stringify(expectedNpx)}`)) {
+            issues.push(`Codex local bridge must use ${expectedNpx} on ${platform}.`);
+        }
+        if (!content.includes('startup_timeout_sec = 300')) {
+            issues.push('Codex local bridge must set startup_timeout_sec = 300 so first-run npx installs do not hide sap_payments.');
+        }
+        if (!content.includes('tool_timeout_sec = 300')) {
+            issues.push('Codex local bridge must set tool_timeout_sec = 300 for paid settlement retries.');
+        }
+        const codexSapSection = getCodexMcpServerSection(content, SAP_SERVER_NAME);
+        const codexPaymentBridgeSection = getCodexMcpServerSection(content, SAP_PAYMENT_BRIDGE_SERVER_NAME);
+        if (codexSapSection.includes('mcp-remote') || codexPaymentBridgeSection.includes('mcp-remote')) {
+            issues.push('Legacy mcp-remote wrapper remains; Codex should use native Streamable HTTP plus sap_payments.');
+        }
+    }
+    return Array.from(new Set(issues));
+}
+/**
+ * @name resolveHostedPaymentBridgeContent
+ * @description Builds hosted SAP MCP plus local sap_payments config and auto-repairs stale runtime config.
+ */
+export function resolveHostedPaymentBridgeContent(target, content, platform = process.platform) {
+    const preExistingIssues = content.trim()
+        ? validateHostedPaymentBridgeContent(target, content, platform)
+        : [];
+    const built = buildHostedPaymentBridgeContent(target, content, platform);
+    const builtIssues = validateHostedPaymentBridgeContent(target, built.nextContent, platform);
+    if (builtIssues.length === 0) {
+        return {
+            nextContent: built.nextContent,
+            hadSapConfig: built.hadSapConfig,
+            resolvedIssues: preExistingIssues,
+        };
+    }
+    throw new Error(`${target.label} hosted payment bridge auto-resolver failed without writing changes: ${builtIssues.join(' ')}`);
+}
 /**
  * @name removeTomlSapSections
  * @description Removes existing Codex SAP MCP TOML sections before appending the canonical one.
@@ -955,7 +1075,7 @@ function buildTomlContent(content, canonical) {
  * @name buildCodexHostedPaymentBridgeContent
  * @description Builds Codex TOML with hosted SAP MCP plus a local sap_payments x402 bridge.
  */
-export function buildCodexHostedPaymentBridgeContent(content, hostedUrl = HOSTED_SAP_MCP_URL) {
+export function buildCodexHostedPaymentBridgeContent(content, hostedUrl = HOSTED_SAP_MCP_URL, platform = process.platform) {
     const stripped = removeTomlMcpServerSections(content, [SAP_SERVER_NAME, SAP_PAYMENT_BRIDGE_SERVER_NAME]);
     const hosted = {
         url: hostedUrl,
@@ -965,7 +1085,7 @@ export function buildCodexHostedPaymentBridgeContent(content, hostedUrl = HOSTED
     const nextContent = [
         prefix,
         hostedTomlServerBlock(hosted).trimEnd(),
-        codexPaymentBridgeTomlBlock(createNpxPaymentBridgeServerConfig()).trimEnd(),
+        codexPaymentBridgeTomlBlock(createNpxPaymentBridgeServerConfigForPlatform(platform)).trimEnd(),
     ].filter(Boolean).join('\n\n');
     return {
         nextContent: `${nextContent}\n`,
@@ -976,7 +1096,7 @@ export function buildCodexHostedPaymentBridgeContent(content, hostedUrl = HOSTED
  * @name installCodexHostedPaymentBridgeConfig
  * @description Writes Codex config.toml with hosted SAP MCP and the local x402 payment bridge.
  */
-export function installCodexHostedPaymentBridgeConfig(homeDir = homedir()) {
+export function installCodexHostedPaymentBridgeConfig(homeDir = homedir(), platform = process.platform) {
     const target = {
         id: 'codex',
         label: 'Codex',
@@ -985,67 +1105,71 @@ export function installCodexHostedPaymentBridgeConfig(homeDir = homedir()) {
         exists: existsSync(join(homeDir, '.codex', 'config.toml')),
     };
     const before = readTargetContent(target);
-    const built = buildCodexHostedPaymentBridgeContent(before);
+    const resolved = resolveHostedPaymentBridgeContent(target, before, platform);
     const backupPath = target.exists ? `${target.path}.bak-${Date.now()}` : undefined;
     mkdirSync(dirname(target.path), { recursive: true });
     if (backupPath) {
         writeFileSync(backupPath, before, 'utf-8');
     }
-    writeFileSync(target.path, built.nextContent, 'utf-8');
+    writeFileSync(target.path, resolved.nextContent, 'utf-8');
     return {
         target,
-        mode: built.hadSapConfig ? 'override' : 'merge',
+        mode: resolved.hadSapConfig ? 'override' : 'merge',
         written: true,
         backupPath,
-        message: built.hadSapConfig
-            ? 'Updated Codex hosted SAP MCP and local x402 payment bridge config'
-            : 'Created Codex hosted SAP MCP and local x402 payment bridge config',
+        message: resolved.resolvedIssues.length > 0
+            ? `Auto-repaired Codex hosted SAP MCP and local x402 payment bridge config (${resolved.resolvedIssues.length} issue${resolved.resolvedIssues.length === 1 ? '' : 's'} fixed)`
+            : resolved.hadSapConfig
+                ? 'Updated Codex hosted SAP MCP and local x402 payment bridge config'
+                : 'Created Codex hosted SAP MCP and local x402 payment bridge config',
     };
 }
 /**
  * @name buildHostedPaymentBridgeContent
  * @description Builds runtime-specific config with hosted SAP MCP and local x402 bridge.
  */
-export function buildHostedPaymentBridgeContent(target, content) {
+export function buildHostedPaymentBridgeContent(target, content, platform = process.platform) {
     if (target.format === 'toml') {
-        return buildCodexHostedPaymentBridgeContent(content);
+        return buildCodexHostedPaymentBridgeContent(content, HOSTED_SAP_MCP_URL, platform);
     }
     if (target.format === 'json') {
-        return buildHostedPaymentBridgeJsonContent(content, target);
+        return buildHostedPaymentBridgeJsonContent(content, target, platform);
     }
     if (target.id === 'openclaw') {
-        return replaceOpenClawYamlHostedPaymentBridgeBlocks(content);
+        return replaceOpenClawYamlHostedPaymentBridgeBlocks(content, platform);
     }
-    return replaceYamlHostedPaymentBridgeBlocks(content);
+    return replaceYamlHostedPaymentBridgeBlocks(content, platform);
 }
 /**
  * @name installHostedPaymentBridgeConfig
  * @description Installs or repairs hosted SAP MCP plus local x402 bridge config for a concrete runtime target.
  */
-export function installHostedPaymentBridgeConfig(target) {
+export function installHostedPaymentBridgeConfig(target, platform = process.platform) {
     if (target.id === 'codex') {
-        return installCodexHostedPaymentBridgeConfig(dirname(dirname(target.path)));
+        return installCodexHostedPaymentBridgeConfig(dirname(dirname(target.path)), platform);
     }
     const currentTarget = {
         ...target,
         exists: existsSync(target.path),
     };
     const before = readTargetContent(currentTarget);
-    const built = buildHostedPaymentBridgeContent(currentTarget, before);
+    const resolved = resolveHostedPaymentBridgeContent(currentTarget, before, platform);
     const backupPath = currentTarget.exists ? `${currentTarget.path}.bak-${Date.now()}` : undefined;
     mkdirSync(dirname(currentTarget.path), { recursive: true, mode: 0o700 });
     if (backupPath) {
         writeFileSync(backupPath, before, 'utf-8');
     }
-    writeFileSync(currentTarget.path, built.nextContent, { encoding: 'utf-8', mode: 0o600 });
+    writeFileSync(currentTarget.path, resolved.nextContent, { encoding: 'utf-8', mode: 0o600 });
     return {
         target: currentTarget,
-        mode: built.hadSapConfig ? 'override' : 'merge',
+        mode: resolved.hadSapConfig ? 'override' : 'merge',
         written: true,
         backupPath,
-        message: built.hadSapConfig
-            ? `Repaired hosted SAP MCP and local x402 payment bridge config in ${currentTarget.label}`
-            : `Installed hosted SAP MCP and local x402 payment bridge config in ${currentTarget.label}`,
+        message: resolved.resolvedIssues.length > 0
+            ? `Auto-repaired hosted SAP MCP and local x402 payment bridge config in ${currentTarget.label} (${resolved.resolvedIssues.length} issue${resolved.resolvedIssues.length === 1 ? '' : 's'} fixed)`
+            : resolved.hadSapConfig
+                ? `Repaired hosted SAP MCP and local x402 payment bridge config in ${currentTarget.label}`
+                : `Installed hosted SAP MCP and local x402 payment bridge config in ${currentTarget.label}`,
     };
 }
 /**
@@ -1056,7 +1180,7 @@ export function installHostedPaymentBridgeConfigs(runtimeIds, homeDir = homedir(
     const selected = new Set(runtimeIds);
     const targets = discoverMcpClientTargets(homeDir, platform)
         .filter((target) => selected.has(target.id));
-    return targets.map((target) => installHostedPaymentBridgeConfig(target));
+    return targets.map((target) => installHostedPaymentBridgeConfig(target, platform));
 }
 /**
  * @name summarizeContent