ebay-mcp 1.7.1 → 1.7.2

package/README.md

@@ -223,6 +223,8 @@ EBAY_CLIENT_ID=your_client_id
 EBAY_CLIENT_SECRET=your_client_secret
 EBAY_ENVIRONMENT=sandbox  # or "production"
 EBAY_REDIRECT_URI=your_runame
+EBAY_MARKETPLACE_ID=EBAY_US  # Default marketplace (overridable by many tools)
+EBAY_CONTENT_LANGUAGE=en-US  # Default request content language (global)
 EBAY_USER_REFRESH_TOKEN=your_refresh_token  # For higher rate limits
 ```
 

package/build/api/client.js

@@ -37,6 +37,22 @@ export class EbayApiClient {
     baseUrl;
     rateLimitTracker;
     config;
+    /**
+     * Build default request headers based on configured marketplace and language.
+     */
+    getDefaultHeaders() {
+        const headers = {
+            'Content-Type': 'application/json',
+            Accept: 'application/json',
+        };
+        if (this.config.contentLanguage) {
+            headers['Content-Language'] = this.config.contentLanguage;
+        }
+        if (this.config.marketplaceId) {
+            headers['X-EBAY-C-MARKETPLACE-ID'] = this.config.marketplaceId;
+        }
+        return headers;
+    }
     constructor(config) {
         this.config = config;
         this.authClient = new EbayOAuthClient(config);
@@ -45,10 +61,7 @@ export class EbayApiClient {
         this.httpClient = axios.create({
             baseURL: this.baseUrl,
             timeout: 30000,
-            headers: {
-                'Content-Type': 'application/json',
-                Accept: 'application/json',
-            },
+            headers: this.getDefaultHeaders(),
         });
         // Add request interceptor to inject auth token and check rate limits
         this.httpClient.interceptors.request.use(async (config) => {
@@ -283,8 +296,7 @@ export class EbayApiClient {
                 params,
                 headers: {
                     Authorization: `Bearer ${token}`,
-                    'Content-Type': 'application/json',
-                    Accept: 'application/json',
+                    ...this.getDefaultHeaders(),
                 },
                 timeout: 30000,
             });
@@ -305,8 +317,7 @@ export class EbayApiClient {
                         params,
                         headers: {
                             Authorization: `Bearer ${token}`,
-                            'Content-Type': 'application/json',
-                            Accept: 'application/json',
+                            ...this.getDefaultHeaders(),
                         },
                         timeout: 30000,
                     });

package/build/api/listing-management/inventory.js

@@ -60,11 +60,7 @@ export class InventoryApi {
             throw new Error('inventoryItem is required and must be an object');
         }
         try {
-            return await this.client.put(`${this.basePath}/inventory_item/${sku}`, inventoryItem, {
-                headers: {
-                    'Content-Language': 'en-US',
-                },
-            });
+            return await this.client.put(`${this.basePath}/inventory_item/${sku}`, inventoryItem);
         }
         catch (error) {
             throw new Error(`Failed to create or replace inventory item: ${error instanceof Error ? error.message : 'Unknown error'}`);
@@ -95,11 +91,7 @@ export class InventoryApi {
             throw new Error('requests is required and must be an object');
         }
         try {
-            return await this.client.post(`${this.basePath}/bulk_create_or_replace_inventory_item`, requests, {
-                headers: {
-                    'Content-Language': 'en-US',
-                },
-            });
+            return await this.client.post(`${this.basePath}/bulk_create_or_replace_inventory_item`, requests);
         }
         catch (error) {
             throw new Error(`Failed to bulk create or replace inventory items: ${error instanceof Error ? error.message : 'Unknown error'}`);
@@ -166,11 +158,7 @@ export class InventoryApi {
             throw new Error('compatibility is required and must be an object');
         }
         try {
-            return await this.client.put(`${this.basePath}/inventory_item/${sku}/product_compatibility`, compatibility, {
-                headers: {
-                    'Content-Language': 'en-US',
-                },
-            });
+            return await this.client.put(`${this.basePath}/inventory_item/${sku}/product_compatibility`, compatibility);
         }
         catch (error) {
             throw new Error(`Failed to create or replace product compatibility: ${error instanceof Error ? error.message : 'Unknown error'}`);
@@ -221,11 +209,7 @@ export class InventoryApi {
             throw new Error('inventoryItemGroup is required and must be an object');
         }
         try {
-            return await this.client.put(`${this.basePath}/inventory_item_group/${inventoryItemGroupKey}`, inventoryItemGroup, {
-                headers: {
-                    'Content-Language': 'en-US',
-                },
-            });
+            return await this.client.put(`${this.basePath}/inventory_item_group/${inventoryItemGroupKey}`, inventoryItemGroup);
         }
         catch (error) {
             throw new Error(`Failed to create or replace inventory item group: ${error instanceof Error ? error.message : 'Unknown error'}`);
@@ -431,11 +415,7 @@ export class InventoryApi {
             throw new Error('offer is required and must be an object');
         }
         try {
-            return await this.client.post(`${this.basePath}/offer`, offer, {
-                headers: {
-                    'Content-Language': 'en-US',
-                },
-            });
+            return await this.client.post(`${this.basePath}/offer`, offer);
         }
         catch (error) {
             throw new Error(`Failed to create offer: ${error instanceof Error ? error.message : 'Unknown error'}`);
@@ -454,11 +434,7 @@ export class InventoryApi {
             throw new Error('offer is required and must be an object');
         }
         try {
-            return await this.client.put(`${this.basePath}/offer/${offerId}`, offer, {
-                headers: {
-                    'Content-Language': 'en-US',
-                },
-            });
+            return await this.client.put(`${this.basePath}/offer/${offerId}`, offer);
         }
         catch (error) {
             throw new Error(`Failed to update offer: ${error instanceof Error ? error.message : 'Unknown error'}`);
@@ -521,11 +497,7 @@ export class InventoryApi {
             throw new Error('requests is required and must be an object');
         }
         try {
-            return await this.client.post(`${this.basePath}/bulk_create_offer`, requests, {
-                headers: {
-                    'Content-Language': 'en-US',
-                },
-            });
+            return await this.client.post(`${this.basePath}/bulk_create_offer`, requests);
         }
         catch (error) {
             throw new Error(`Failed to bulk create offers: ${error instanceof Error ? error.message : 'Unknown error'}`);

package/build/config/environment.js

@@ -62,13 +62,7 @@ export function getDefaultScopes(environment) {
     if (environment === 'production') {
         return getProductionScopes();
     }
-    const sandboxScopes = getSandboxScopes();
-    const productionScopes = getProductionScopes();
-    const productionWithoutEdelivery = productionScopes.filter((scope) => scope !== 'https://api.ebay.com/oauth/scope/sell.edelivery');
-    const mergedScopes = new Set([...sandboxScopes, ...productionWithoutEdelivery]);
-    mergedScopes.add('https://api.ebay.com/oauth/api_scope/sell.edelivery');
-    mergedScopes.add('https://api.ebay.com/oauth/scope/sell.edelivery');
-    return Array.from(mergedScopes);
+    return getSandboxScopes();
 }
 /**
  * Validate scopes against environment and return warnings for invalid scopes
@@ -144,6 +138,9 @@ export function validateEnvironmentConfig() {
         errors,
     };
 }
+/**
+ * Build EbayConfig from environment variables with safe defaults.
+ */
 export function getEbayConfig() {
     const clientId = process.env.EBAY_CLIENT_ID ?? '';
     const clientSecret = process.env.EBAY_CLIENT_SECRET ?? '';
@@ -151,6 +148,8 @@ export function getEbayConfig() {
     const accessToken = process.env.EBAY_USER_ACCESS_TOKEN ?? '';
     const refreshToken = process.env.EBAY_USER_REFRESH_TOKEN ?? '';
     const appAccessToken = process.env.EBAY_APP_ACCESS_TOKEN ?? '';
+    const marketplaceId = (process.env.EBAY_MARKETPLACE_ID ?? '').trim() || 'EBAY_US';
+    const contentLanguage = (process.env.EBAY_CONTENT_LANGUAGE ?? '').trim() || 'en-US';
     // Only require client credentials - tokens can be optional (generated from refresh token)
     if (clientId === '' || clientSecret === '') {
         console.error('Missing required eBay credentials. Please set:\n1) EBAY_CLIENT_ID\n2) EBAY_CLIENT_SECRET\nin your .env file at project root');
@@ -159,6 +158,8 @@ export function getEbayConfig() {
         clientId,
         clientSecret,
         redirectUri: process.env.EBAY_REDIRECT_URI,
+        marketplaceId,
+        contentLanguage,
         environment,
         accessToken,
         refreshToken,
@@ -188,21 +189,17 @@ export function getAuthUrl(clientIdOrEnvironment, redirectUri, environment, loca
         console.error('clientId, redirectUri (RuName), and scope are required,please initialize the class properly.');
         return '';
     }
-    // Build consent URL with auth2 endpoint (eBay's OAuth consent endpoint)
-    const consentDomain = env === 'production' ? 'https://auth2.ebay.com' : 'https://auth2.sandbox.ebay.com';
-    const consentParams = new URLSearchParams({
+    const authBase = env === 'production' ? 'https://auth.ebay.com' : 'https://auth.sandbox.ebay.com';
+    const scopeList = scopes?.join('%20') || scope.join('%20');
+    const authorizeParams = new URLSearchParams({
         client_id: clientId,
         redirect_uri: redirectUri,
         response_type: responseType,
-        scope: scopes?.join(' ') || scope.join(' '),
         prompt,
         locale,
         ...(state ? { state } : {}),
     });
-    const consentUrl = `${consentDomain}/oauth2/consents?${consentParams.toString()}`;
-    // Build signin URL that redirects to consent
-    const signinDomain = env === 'production' ? 'https://signin.ebay.com' : 'https://signin.sandbox.ebay.com';
-    return `${signinDomain}/signin?ru=${encodeURIComponent(consentUrl)}&sgfl=oauth2&AppName=${encodeURIComponent(clientId)}`;
+    return `${authBase}/oauth2/authorize?${authorizeParams.toString()}&scope=${scopeList}`;
 }
 /**
  * Generate the OAuth authorization URL for user consent
@@ -213,33 +210,22 @@ export function getAuthUrl(clientIdOrEnvironment, redirectUri, environment, loca
  */
 export function getOAuthAuthorizationUrl(clientId, redirectUri, // MUST be eBay RuName, NOT a URL
 environment, scopes, locale, state) {
-    // Build the authorize URL using auth2 endpoint (correct eBay OAuth endpoint)
-    const authDomain = environment === 'production' ? 'https://auth2.ebay.com' : 'https://auth2.sandbox.ebay.com';
-    const authorizeEndpoint = `${authDomain}/oauth2/authorize`;
-    // Build query parameters for the authorize endpoint
-    const params = new URLSearchParams({
-        client_id: clientId,
-        redirect_uri: redirectUri,
-    });
-    // Add scopes only if provided (optional - eBay handles automatically if not specified)
+    const authBase = environment === 'production' ? 'https://auth.ebay.com' : 'https://auth.sandbox.ebay.com';
+    let scopeList;
     if (scopes && scopes.length > 0) {
-        params.append('scope', scopes.join(' '));
+        scopeList = scopes.join('%20');
     }
     else {
-        // Use default scopes for the environment if no scopes are specified
         const defaultScopes = getDefaultScopes(environment);
-        params.append('scope', defaultScopes.join(' '));
+        scopeList = defaultScopes.join('%20');
     }
-    // Always add state parameter (empty if not provided)
-    params.append('state', state || '');
-    // Add response_type
-    params.append('response_type', 'code');
-    // Add hd parameter (required by eBay)
-    params.append('hd', '');
-    // Build the signin URL that redirects to authorize
-    const signinDomain = environment === 'production' ? 'https://signin.ebay.com' : 'https://signin.sandbox.ebay.com';
-    const ruParam = encodeURIComponent(`${authorizeEndpoint}?${params.toString()}`);
-    return `${signinDomain}/signin?ru=${ruParam}&sgfl=oauth2_login&AppName=${clientId}`;
+    const params = new URLSearchParams({
+        client_id: clientId,
+        redirect_uri: redirectUri,
+        response_type: 'code',
+        ...(state ? { state } : {}),
+    });
+    return `${authBase}/oauth2/authorize?${params.toString()}&scope=${scopeList}`;
 }
 const iconUrl = (size) => {
     const url = new URL(`../../public/icons/${size}.png`, import.meta.url);

package/build/scripts/auto-setup.js

@@ -135,6 +135,12 @@ function generateMCPServerConfig() {
     if (process.env.EBAY_REDIRECT_URI) {
         config.env.EBAY_REDIRECT_URI = process.env.EBAY_REDIRECT_URI;
     }
+    if (process.env.EBAY_MARKETPLACE_ID) {
+        config.env.EBAY_MARKETPLACE_ID = process.env.EBAY_MARKETPLACE_ID;
+    }
+    if (process.env.EBAY_CONTENT_LANGUAGE) {
+        config.env.EBAY_CONTENT_LANGUAGE = process.env.EBAY_CONTENT_LANGUAGE;
+    }
     if (process.env.EBAY_USER_ACCESS_TOKEN) {
         config.env.EBAY_USER_ACCESS_TOKEN = process.env.EBAY_USER_ACCESS_TOKEN;
     }

package/build/scripts/diagnostics.js

@@ -118,6 +118,8 @@ function displayConfigurationStatus(envVars) {
         { key: 'EBAY_CLIENT_SECRET', label: 'Client Secret', redact: true },
         { key: 'EBAY_REDIRECT_URI', label: 'Redirect URI', redact: false },
         { key: 'EBAY_ENVIRONMENT', label: 'Environment', redact: false },
+        { key: 'EBAY_MARKETPLACE_ID', label: 'Marketplace ID', redact: false },
+        { key: 'EBAY_CONTENT_LANGUAGE', label: 'Content Language', redact: false },
         { key: 'EBAY_USER_REFRESH_TOKEN', label: 'User Refresh Token', redact: true },
         { key: 'EBAY_USER_ACCESS_TOKEN', label: 'User Access Token', redact: true },
         { key: 'EBAY_APP_ACCESS_TOKEN', label: 'App Access Token', redact: true },

package/build/scripts/interactive-setup.js

@@ -143,6 +143,10 @@ EBAY_REDIRECT_URI=${config.EBAY_REDIRECT_URI || 'http://localhost:3000/oauth/cal
 # ═══════════════════════════════════════════════════════════════════
 
 EBAY_ENVIRONMENT=${config.EBAY_ENVIRONMENT || 'sandbox'}
+# Optional: e.g. EBAY_US, EBAY_DE, EBAY_FR
+EBAY_MARKETPLACE_ID=${config.EBAY_MARKETPLACE_ID || ''}
+# Optional: e.g. en-US, de-DE, fr-FR
+EBAY_CONTENT_LANGUAGE=${config.EBAY_CONTENT_LANGUAGE || ''}
 
 # ═══════════════════════════════════════════════════════════════════
 # User Tokens (Auto-generated from refresh token)
@@ -667,6 +671,8 @@ async function runInteractiveSetup(args) {
         EBAY_CLIENT_SECRET: credentials.EBAY_CLIENT_SECRET,
         EBAY_REDIRECT_URI: credentials.EBAY_REDIRECT_URI,
         EBAY_ENVIRONMENT: environment,
+        EBAY_MARKETPLACE_ID: existingConfig.EBAY_MARKETPLACE_ID || '',
+        EBAY_CONTENT_LANGUAGE: existingConfig.EBAY_CONTENT_LANGUAGE || '',
         EBAY_USER_REFRESH_TOKEN: refreshToken,
         EBAY_USER_ACCESS_TOKEN: '',
         EBAY_APP_ACCESS_TOKEN: '',

package/build/scripts/setup.js

@@ -4,18 +4,18 @@ import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'fs';
 import { homedir, platform } from 'os';
 import axios from 'axios';
 import chalk from 'chalk';
+import { checkForUpdates } from '../utils/version.js';
 import { config } from 'dotenv';
 import { exec } from 'child_process';
 import { fileURLToPath } from 'url';
+import { getOAuthAuthorizationUrl } from '../config/environment.js';
 import prompts from 'prompts';
-import { getDefaultScopes } from '../config/environment.js';
-import { checkForUpdates } from '../utils/version.js';
 config({ quiet: true });
 checkForUpdates();
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 const PROJECT_ROOT = join(__dirname, '../..');
-const TOTAL_STEPS = 5;
+const TOTAL_STEPS = 6;
 const ebay = {
     red: chalk.hex('#E53238'),
     blue: chalk.hex('#0064D2'),
@@ -31,6 +31,26 @@ const ui = {
     info: chalk.cyan,
     hint: chalk.gray,
 };
+const MARKETPLACE_OPTIONS = [
+    { value: 'EBAY_US', label: 'EBAY_US — United States' },
+    { value: 'EBAY_GB', label: 'EBAY_GB — United Kingdom' },
+    { value: 'EBAY_DE', label: 'EBAY_DE — Germany' },
+    { value: 'EBAY_FR', label: 'EBAY_FR — France' },
+    { value: 'EBAY_IT', label: 'EBAY_IT — Italy' },
+    { value: 'EBAY_ES', label: 'EBAY_ES — Spain' },
+    { value: 'EBAY_CA', label: 'EBAY_CA — Canada' },
+    { value: 'EBAY_AU', label: 'EBAY_AU — Australia' },
+];
+const CONTENT_LANGUAGE_OPTIONS = [
+    { value: 'en-US', label: 'en-US — English (United States)' },
+    { value: 'en-GB', label: 'en-GB — English (United Kingdom)' },
+    { value: 'de-DE', label: 'de-DE — German (Germany)' },
+    { value: 'fr-FR', label: 'fr-FR — French (France)' },
+    { value: 'it-IT', label: 'it-IT — Italian (Italy)' },
+    { value: 'es-ES', label: 'es-ES — Spanish (Spain)' },
+    { value: 'fr-CA', label: 'fr-CA — French (Canada)' },
+    { value: 'nl-BE', label: 'nl-BE — Dutch (Belgium)' },
+];
 const LOGO = `
    ${ebay.red('███████╗')}${ebay.blue('██████╗ ')}${ebay.yellow('█████╗ ')}${ebay.green('██╗   ██╗')}
    ${ebay.red('██╔════╝')}${ebay.blue('██╔══██╗')}${ebay.yellow('██╔══██╗')}${ebay.green('╚██╗ ██╔╝')}
@@ -39,13 +59,22 @@ const LOGO = `
    ${ebay.red('███████╗')}${ebay.blue('██████╔╝')}${ebay.yellow('██║  ██║')}${ebay.green('   ██║   ')}
    ${ebay.red('╚══════╝')}${ebay.blue('╚═════╝ ')}${ebay.yellow('╚═╝  ╚═╝')}${ebay.green('   ╚═╝   ')}
 `;
+/**
+ * Clear the terminal screen.
+ */
 function clearScreen() {
     console.clear();
 }
+/**
+ * Render the eBay ASCII logo and heading.
+ */
 function showLogo() {
     console.log(LOGO);
-    console.log(ui.bold.white('            MCP Server Setup Wizard\n'));
+    console.log(ui.bold.white('            MCP Server Setup Wizard by Yosef Hayim Sabag\n'));
 }
+/**
+ * Render a step progress bar with title.
+ */
 function showProgress(step, title) {
     const filled = '●'.repeat(step);
     const empty = '○'.repeat(TOTAL_STEPS - step);
@@ -54,21 +83,33 @@ function showProgress(step, title) {
     console.log(`  ${progress}  ${ui.bold(`Step ${step}/${TOTAL_STEPS}`)}: ${title}`);
     console.log(ui.dim('─'.repeat(60)) + '\n');
 }
+/**
+ * Render keyboard hints for the current step.
+ */
 function showKeyboardHints(hints) {
     const hintText = hints.map((h) => ui.dim(h)).join('  │  ');
     console.log(`\n  ${hintText}\n`);
 }
+/**
+ * Render a tip callout.
+ */
 function showTip(message) {
     console.log(`  ${ebay.yellow('💡 Tip:')} ${ui.dim(message)}\n`);
 }
+/**
+ * Render a success line.
+ */
 function showSuccess(message) {
     console.log(`  ${ui.success('✓')} ${message}`);
 }
+/**
+ * Render an error line.
+ */
 function showError(message) {
     console.log(`  ${ui.error('✗')} ${message}`);
 }
 /**
- * Open a URL in the default browser (cross-platform)
+ * Open a URL in the default browser (cross-platform).
  */
 function openBrowser(url) {
     return new Promise((resolve, reject) => {
@@ -94,6 +135,9 @@ function openBrowser(url) {
         });
     });
 }
+/**
+ * Render a warning line.
+ */
 function showWarning(message) {
     console.log(`  ${ui.warning('⚠')} ${message}`);
 }
@@ -260,9 +304,15 @@ function displayUserInfo(userInfo) {
         `User ID:         ${userInfo.userId?.slice(0, 30)}...`,
     ]);
 }
+/**
+ * Render an informational line.
+ */
 function showInfo(message) {
     console.log(`  ${ui.info('ℹ')} ${message}`);
 }
+/**
+ * Render a spinner and return a stop callback.
+ */
 function showSpinner(message) {
     const frames = ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'];
     let i = 0;
@@ -276,6 +326,9 @@ function showSpinner(message) {
         process.stdout.write('\r' + ' '.repeat(message.length + 10) + '\r');
     };
 }
+/**
+ * Render a bordered info box.
+ */
 function showBox(title, content) {
     const width = 60;
     const line = '─'.repeat(width - 2);
@@ -288,6 +341,9 @@ function showBox(title, content) {
     }
     console.log(`  ${ui.dim('└' + line + '┘')}\n`);
 }
+/**
+ * Compute MCP client config paths by OS.
+ */
 function getConfigPaths() {
     const home = homedir();
     const os = platform();
@@ -328,6 +384,9 @@ function getConfigPaths() {
     };
     return paths;
 }
+/**
+ * Detect installed MCP-compatible clients.
+ */
 function detectLLMClients() {
     const paths = getConfigPaths();
     const clients = [];
@@ -344,6 +403,9 @@ function detectLLMClients() {
     }
     return clients;
 }
+/**
+ * Write MCP server config for a detected client.
+ */
 function configureLLMClient(client, projectRoot) {
     try {
         const configDir = dirname(client.configPath);
@@ -462,6 +524,12 @@ function updateClaudeDesktopConfig(envConfig, environment) {
         if (envConfig.EBAY_REDIRECT_URI) {
             envVars.EBAY_REDIRECT_URI = envConfig.EBAY_REDIRECT_URI;
         }
+        if (envConfig.EBAY_MARKETPLACE_ID) {
+            envVars.EBAY_MARKETPLACE_ID = envConfig.EBAY_MARKETPLACE_ID;
+        }
+        if (envConfig.EBAY_CONTENT_LANGUAGE) {
+            envVars.EBAY_CONTENT_LANGUAGE = envConfig.EBAY_CONTENT_LANGUAGE;
+        }
         if (envConfig.EBAY_USER_REFRESH_TOKEN) {
             envVars.EBAY_USER_REFRESH_TOKEN = envConfig.EBAY_USER_REFRESH_TOKEN;
         }
@@ -504,6 +572,9 @@ function updateClaudeDesktopConfig(envConfig, environment) {
         };
     }
 }
+/**
+ * Load existing environment variables from the .env file.
+ */
 function loadExistingConfig() {
     const envPath = join(PROJECT_ROOT, '.env');
     const envConfig = {};
@@ -521,6 +592,9 @@ function loadExistingConfig() {
     }
     return envConfig;
 }
+/**
+ * Format a date for display in the .env header.
+ */
 function formatDate(date) {
     const options = {
         weekday: 'long',
@@ -534,9 +608,18 @@ function formatDate(date) {
     };
     return date.toLocaleString('en-US', options);
 }
+/**
+ * Persist setup configuration to the project .env file.
+ */
 function saveConfig(envConfig, environment) {
     const envPath = join(PROJECT_ROOT, '.env');
     const now = new Date();
+    const marketplaceLine = envConfig.EBAY_MARKETPLACE_ID
+        ? `EBAY_MARKETPLACE_ID=${envConfig.EBAY_MARKETPLACE_ID}`
+        : '# EBAY_MARKETPLACE_ID=EBAY_US';
+    const contentLanguageLine = envConfig.EBAY_CONTENT_LANGUAGE
+        ? `EBAY_CONTENT_LANGUAGE=${envConfig.EBAY_CONTENT_LANGUAGE}`
+        : '# EBAY_CONTENT_LANGUAGE=en-US';
     const content = `# eBay MCP Server Configuration
 # Last Updated: ${formatDate(now)}
 # Environment: ${environment}
@@ -545,6 +628,8 @@ EBAY_CLIENT_ID=${envConfig.EBAY_CLIENT_ID || ''}
 EBAY_CLIENT_SECRET=${envConfig.EBAY_CLIENT_SECRET || ''}
 EBAY_REDIRECT_URI=${envConfig.EBAY_REDIRECT_URI || ''}
 EBAY_ENVIRONMENT=${environment}
+${marketplaceLine}
+${contentLanguageLine}
 
 EBAY_USER_REFRESH_TOKEN=${envConfig.EBAY_USER_REFRESH_TOKEN || ''}
 EBAY_USER_ACCESS_TOKEN=${envConfig.EBAY_USER_ACCESS_TOKEN || ''}
@@ -557,10 +642,12 @@ async function stepWelcome(state) {
     showLogo();
     console.log(ui.dim('  Welcome to the eBay MCP Server setup wizard!\n'));
     console.log('  This wizard will help you:\n');
-    console.log(`    ${ui.success('1.')} Configure your eBay Developer credentials`);
-    console.log(`    ${ui.success('2.')} Set up OAuth authentication`);
-    console.log(`    ${ui.success('3.')} Configure your MCP client (Claude, Cline, etc.)`);
-    console.log(`    ${ui.success('4.')} Validate your setup\n`);
+    console.log(`    ${ui.success('1.')} Choose environment (sandbox/production)`);
+    console.log(`    ${ui.success('2.')} Set default marketplace and language (optional)`);
+    console.log(`    ${ui.success('3.')} Configure your eBay Developer credentials`);
+    console.log(`    ${ui.success('4.')} Set up OAuth authentication`);
+    console.log(`    ${ui.success('5.')} Configure your MCP client (Claude, Cline, etc.)`);
+    console.log(`    ${ui.success('6.')} Validate your setup\n`);
     if (state.hasExistingConfig) {
         showInfo('Existing configuration detected. You can update or keep current values.');
     }
@@ -573,6 +660,9 @@ async function stepWelcome(state) {
     });
     return response.continue !== false ? 'continue' : 'cancel';
 }
+/**
+ * Select the eBay environment for this configuration.
+ */
 async function stepEnvironment(state) {
     clearScreen();
     showLogo();
@@ -609,10 +699,128 @@ async function stepEnvironment(state) {
     state.config.EBAY_ENVIRONMENT = response.environment;
     return 'continue';
 }
+/**
+ * Configure optional marketplace and content-language defaults.
+ */
+async function stepMarketplaceSettings(state) {
+    clearScreen();
+    showLogo();
+    showProgress(2, 'Marketplace Settings');
+    if (state.isQuickMode) {
+        showInfo('Quick setup enabled. Skipping optional marketplace configuration.');
+        await new Promise((r) => setTimeout(r, 600));
+        return 'continue';
+    }
+    console.log('  Configure default marketplace and language for API requests.\n');
+    showBox('Marketplace Settings', [
+        'These are optional defaults used for request headers.',
+        'Marketplace can be overridden in many tools; language is global.',
+    ]);
+    const marketplaceChoices = [
+        { title: ui.dim('← Go back'), value: '__back__' },
+        { title: 'Skip (leave unset)', value: '' },
+        ...MARKETPLACE_OPTIONS.map((option) => ({
+            title: option.label,
+            value: option.value,
+        })),
+        { title: 'Other (enter manually)', value: '__custom__' },
+    ];
+    const currentMarketplace = state.config.EBAY_MARKETPLACE_ID || '';
+    const marketplaceDefault = currentMarketplace || 'EBAY_US';
+    const marketplaceMatchIndex = marketplaceChoices.findIndex((choice) => choice.value === marketplaceDefault);
+    const marketplaceInitial = marketplaceMatchIndex >= 0
+        ? marketplaceMatchIndex
+        : marketplaceChoices.findIndex((choice) => choice.value === '__custom__');
+    const marketplaceResponse = await prompts({
+        type: 'select',
+        name: 'marketplaceId',
+        message: 'Select your default eBay marketplace:',
+        choices: marketplaceChoices,
+        initial: marketplaceInitial >= 0 ? marketplaceInitial : 0,
+    });
+    if (marketplaceResponse.marketplaceId === undefined) {
+        return 'cancel';
+    }
+    if (marketplaceResponse.marketplaceId === '__back__') {
+        return 'back';
+    }
+    let marketplaceId = marketplaceResponse.marketplaceId;
+    if (marketplaceId === '__custom__') {
+        const customMarketplace = await prompts({
+            type: 'text',
+            name: 'customMarketplaceId',
+            message: 'Enter marketplace ID (e.g., EBAY_US, EBAY_DE):',
+            initial: currentMarketplace || 'EBAY_US',
+            validate: (value) => value.trim().length === 0 ? 'Marketplace ID cannot be empty' : true,
+        });
+        if (customMarketplace.customMarketplaceId === undefined) {
+            return 'cancel';
+        }
+        marketplaceId = customMarketplace.customMarketplaceId.trim();
+    }
+    if (marketplaceId) {
+        state.config.EBAY_MARKETPLACE_ID = marketplaceId;
+    }
+    else {
+        delete state.config.EBAY_MARKETPLACE_ID;
+    }
+    const languageChoices = [
+        { title: ui.dim('← Go back'), value: '__back__' },
+        { title: 'Skip (leave unset)', value: '' },
+        ...CONTENT_LANGUAGE_OPTIONS.map((option) => ({
+            title: option.label,
+            value: option.value,
+        })),
+        { title: 'Other (enter manually)', value: '__custom__' },
+    ];
+    const currentLanguage = state.config.EBAY_CONTENT_LANGUAGE || '';
+    const languageDefault = currentLanguage || 'en-US';
+    const languageMatchIndex = languageChoices.findIndex((choice) => choice.value === languageDefault);
+    const languageInitial = languageMatchIndex >= 0
+        ? languageMatchIndex
+        : languageChoices.findIndex((choice) => choice.value === '__custom__');
+    const languageResponse = await prompts({
+        type: 'select',
+        name: 'contentLanguage',
+        message: 'Select your preferred Content-Language:',
+        choices: languageChoices,
+        initial: languageInitial >= 0 ? languageInitial : 0,
+    });
+    if (languageResponse.contentLanguage === undefined) {
+        return 'cancel';
+    }
+    if (languageResponse.contentLanguage === '__back__') {
+        return 'back';
+    }
+    let contentLanguage = languageResponse.contentLanguage;
+    if (contentLanguage === '__custom__') {
+        const customLanguage = await prompts({
+            type: 'text',
+            name: 'customContentLanguage',
+            message: 'Enter Content-Language (e.g., en-US, de-DE):',
+            initial: currentLanguage || 'en-US',
+            validate: (value) => value.trim().length === 0 ? 'Content-Language cannot be empty' : true,
+        });
+        if (customLanguage.customContentLanguage === undefined) {
+            return 'cancel';
+        }
+        contentLanguage = customLanguage.customContentLanguage.trim();
+    }
+    if (contentLanguage) {
+        state.config.EBAY_CONTENT_LANGUAGE = contentLanguage;
+    }
+    else {
+        delete state.config.EBAY_CONTENT_LANGUAGE;
+    }
+    return 'continue';
+}
+/**
+ * Collect eBay app credentials from the user.
+ */
 async function stepCredentials(state) {
     clearScreen();
     showLogo();
-    showProgress(2, 'eBay Credentials');
+    showProgress(3, 'eBay Credentials');
     console.log('  Enter your eBay Developer credentials:\n');
     showTip('Get credentials at: https://developer.ebay.com/my/keys');
     showKeyboardHints(['Tab: Next field', 'Enter: Submit', 'Ctrl+C: Cancel']);
@@ -661,10 +869,13 @@ async function stepCredentials(state) {
     state.config.EBAY_REDIRECT_URI = responses.redirectUri;
     return 'continue';
 }
+/**
+ * Acquire and validate OAuth tokens for the configured credentials.
+ */
 async function stepOAuth(state) {
     clearScreen();
     showLogo();
-    showProgress(3, 'OAuth Setup');
+    showProgress(4, 'OAuth Setup');
     console.log('  Configure user authentication for higher API rate limits:\n');
     showBox('Rate Limits by Auth Type', [
         'App Credentials Only:     1,000 req/day',
@@ -855,25 +1066,7 @@ async function stepOAuth(state) {
         }
     }
     else if (tokenChoice.method === 'manual') {
-        // Build the OAuth consent URL (auth2 endpoint)
-        const consentDomain = state.environment === 'production'
-            ? 'https://auth2.ebay.com'
-            : 'https://auth2.sandbox.ebay.com';
-        // Get scopes from environment config
-        const scopes = getDefaultScopes(state.environment);
-        // Build the consent URL parameters
-        const consentParams = new URLSearchParams({
-            client_id: state.config.EBAY_CLIENT_ID,
-            redirect_uri: state.config.EBAY_REDIRECT_URI,
-            response_type: 'code',
-            scope: scopes.join(' '),
-        });
-        const consentUrl = `${consentDomain}/oauth2/consents?${consentParams.toString()}`;
-        // Build the signin URL that redirects to consent
-        const signinDomain = state.environment === 'production'
-            ? 'https://signin.ebay.com'
-            : 'https://signin.sandbox.ebay.com';
-        const authUrl = `${signinDomain}/signin?ru=${encodeURIComponent(consentUrl)}&sgfl=oauth2&AppName=${encodeURIComponent(state.config.EBAY_CLIENT_ID)}`;
+        const authUrl = getOAuthAuthorizationUrl(state.config.EBAY_CLIENT_ID, state.config.EBAY_REDIRECT_URI, state.environment);
         console.log('\n  ' + ui.bold('OAuth Authorization URL:'));
         console.log(ui.dim('  ' + '─'.repeat(56)));
         console.log(`  ${ui.info(authUrl)}`);
@@ -1094,10 +1287,13 @@ async function stepOAuth(state) {
     }
     return 'continue';
 }
+/**
+ * Configure MCP clients with the generated environment variables.
+ */
 async function stepMCPClients(state) {
     clearScreen();
     showLogo();
-    showProgress(4, 'MCP Client Setup');
+    showProgress(5, 'MCP Client Setup');
     console.log('  Configure your AI assistant to use the eBay MCP server:\n');
     state.detectedClients = detectLLMClients();
     const detected = state.detectedClients.filter((c) => c.detected);
@@ -1184,10 +1380,13 @@ async function stepMCPClients(state) {
     }
     return 'continue';
 }
+/**
+ * Finalize setup and display summary information.
+ */
 async function stepComplete(state) {
     clearScreen();
     showLogo();
-    showProgress(5, 'Setup Complete');
+    showProgress(6, 'Setup Complete');
     const stopSpinner = showSpinner('Saving configuration...');
     await new Promise((r) => setTimeout(r, 300));
     saveConfig(state.config, state.environment);
@@ -1196,6 +1395,8 @@ async function stepComplete(state) {
     console.log(ui.bold.green('\n  🎉 Setup Complete!\n'));
     showBox('Configuration Summary', [
         `Environment:     ${state.environment}`,
+        `Marketplace ID:  ${state.config.EBAY_MARKETPLACE_ID || 'Not set'}`,
+        `Content-Lang:    ${state.config.EBAY_CONTENT_LANGUAGE || 'Not set'}`,
         `Client ID:       ${state.config.EBAY_CLIENT_ID?.slice(0, 20)}...`,
         `Redirect URI:    ${state.config.EBAY_REDIRECT_URI?.slice(0, 30)}...`,
         `OAuth Token:     ${state.config.EBAY_USER_REFRESH_TOKEN ? '✓ Configured' : '✗ Not set'}`,
@@ -1268,7 +1469,14 @@ async function main() {
         hasExistingConfig: Object.keys(existingConfig).length > 0,
         isQuickMode: args.quick,
     };
-    const steps = [stepWelcome, stepEnvironment, stepCredentials, stepOAuth, stepMCPClients];
+    const steps = [
+        stepWelcome,
+        stepEnvironment,
+        stepMarketplaceSettings,
+        stepCredentials,
+        stepOAuth,
+        stepMCPClients,
+    ];
     let stepIndex = 0;
     while (stepIndex < steps.length) {
         const result = await steps[stepIndex](state);

package/build/tools/definitions/token-management.js

@@ -126,7 +126,7 @@ export const tokenManagementTools = [
             'IMPORTANT NOTES:\n' +
             '- Authorization codes expire in ~5 minutes - if you get "invalid grant" error, get a fresh code\n' +
             '- Codes can be URL-encoded (e.g., v%5E1.1%23...) - this tool automatically decodes them\n' +
-            '- Extract the code parameter from the redirect URL: https://auth2.ebay.com/...&code=YOUR_CODE&expires_in=299\n' +
+            '- Extract the code parameter from the redirect URL (your RuName Accept URL): https://your-redirect-uri?code=YOUR_CODE&expires_in=299\n' +
             '- Tokens are saved to .env file and will auto-refresh every 2 hours\n' +
             '- Refresh tokens last 18 months before requiring re-authorization\n\n' +
             'COMMON ERRORS:\n' +

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ebay-mcp",
-  "version": "1.7.1",
+  "version": "1.7.2",
   "description": "Local MCP server for eBay APIs - provides access to eBay developer functionality through MCP (Model Context Protocol)",
   "type": "module",
   "main": "build/index.js",