ebay-mcp 1.13.2 → 1.14.0

package/build/scripts/setup.js

@@ -4,20 +4,22 @@ import { existsSync, readFileSync, writeFileSync } from 'fs';
 import { homedir, platform } from 'os';
 import { randomUUID } from 'crypto';
 import chalk from 'chalk';
+import { Data, Effect, Either } from 'effect';
 import { checkForUpdates } from '../utils/version.js';
 import { describeHttpError, httpRequest } from '../utils/http.js';
 import { config } from 'dotenv';
 import { fileURLToPath } from 'url';
 import { getOAuthAuthorizationUrl } from '../config/environment.js';
-import { startCallbackServer } from '../utils/oauth-helper.js';
-import { defineWizard, runWizard, ClackRenderer } from '../utils/setup-wizard.js';
-import { loadExistingConfig, quoteEnvValue } from './setup-shared.js';
+import { startCallbackServer } from '../utils/oauthHelper.js';
+import { defineWizard, runWizard } from '../utils/setupWizard.js';
+import { loadExistingConfig, quoteEnvValue } from './setupShared.js';
 import { runSkillsWizard } from './skills.js';
 import prompts from 'prompts';
-import { configureLLMClient, detectLLMClients } from '../utils/llm-client-detector.js';
-import { runSecurityChecks, displaySecurityResults } from '../utils/security-checker.js';
-import { validateSetup, displayRecommendations } from '../utils/setup-validator.js';
+import { configureLLMClient, detectLLMClients } from '../utils/llmClientDetector.js';
+import { runSecurityChecks, displaySecurityResults } from '../utils/securityChecker.js';
+import { validateSetup, displayRecommendations } from '../utils/setupValidator.js';
 import { getErrorMessage } from '../utils/errors.js';
+import process from 'node:process';
 config({ quiet: true });
 checkForUpdates();
 const __filename = fileURLToPath(import.meta.url);
@@ -67,6 +69,9 @@ const ui = {
 };
 const DEVELOPER_NAME = 'Yosef Hayim Sabag';
 const DEVELOPER_LINKEDIN = 'https://www.linkedin.com/in/yosef-hayim-sabag/';
+/** Tagged failure raised while the setup wizard captures the OAuth redirect. */
+class SetupCaptureError extends Data.TaggedError('SetupCaptureError') {
+}
 /** Render the wizard's branding header: logo, title, and developer credit. */
 function printWizardBanner() {
     console.log(LOGO);
@@ -79,29 +84,26 @@ function printWizardBanner() {
 function parseAuthorizationCode(input) {
     const trimmed = input.trim();
     if (trimmed.includes('code=') || trimmed.includes('?') || trimmed.includes('&')) {
-        try {
-            let searchParams;
-            if (trimmed.startsWith('http')) {
-                searchParams = new URL(trimmed).searchParams;
-            }
-            else {
-                searchParams = new URLSearchParams(trimmed.startsWith('?') ? trimmed.slice(1) : trimmed);
-            }
-            const code = searchParams.get('code');
-            if (code)
-                return decodeURIComponent(code);
-        }
-        catch {
-            // fall through
+        const parsedCode = Effect.runSync(Effect.either(Effect.try({
+            try: () => {
+                const searchParams = trimmed.startsWith('http')
+                    ? new URL(trimmed).searchParams
+                    : new URLSearchParams(trimmed.startsWith('?') ? trimmed.slice(1) : trimmed);
+                const code = searchParams.get('code');
+                return code ? decodeURIComponent(code) : null;
+            },
+            catch: (error) => error,
+        })));
+        if (Either.isRight(parsedCode) && parsedCode.right) {
+            return parsedCode.right;
         }
     }
     if (trimmed.startsWith('v^1.1#') || trimmed.startsWith('v%5E1.1')) {
-        try {
-            return decodeURIComponent(trimmed);
-        }
-        catch {
-            return trimmed;
-        }
+        const decodedToken = Effect.runSync(Effect.either(Effect.try({
+            try: () => decodeURIComponent(trimmed),
+            catch: (error) => error,
+        })));
+        return Either.isRight(decodedToken) ? decodedToken.right : trimmed;
     }
     return null;
 }
@@ -210,63 +212,69 @@ function updateClaudeDesktopConfig(envConfig, environment) {
     const configPath = getClaudeDesktopConfigPath();
     if (!existsSync(dirname(configPath)))
         return { success: false, configPath, error: 'Claude Desktop not installed' };
-    try {
-        let existing = {};
-        if (existsSync(configPath)) {
-            try {
-                existing = JSON.parse(readFileSync(configPath, 'utf-8'));
-            }
-            catch (e) {
-                return {
-                    success: false,
-                    configPath,
-                    error: `Invalid JSON in config: ${getErrorMessage(e, 'parse error')}`,
-                    details: 'Please fix the JSON syntax in your Claude config file',
-                };
+    const updated = Effect.runSync(Effect.either(Effect.try({
+        try: () => {
+            let existing = {};
+            if (existsSync(configPath)) {
+                const parsed = Effect.runSync(Effect.either(Effect.try({
+                    try: () => JSON.parse(readFileSync(configPath, 'utf-8')),
+                    catch: (error) => error,
+                })));
+                if (Either.isLeft(parsed)) {
+                    return {
+                        success: false,
+                        configPath,
+                        error: `Invalid JSON in config: ${getErrorMessage(parsed.left, 'parse error')}`,
+                        details: 'Please fix the JSON syntax in your Claude config file',
+                    };
+                }
+                existing = parsed.right;
             }
-        }
-        if (!existing.mcpServers || typeof existing.mcpServers !== 'object')
-            existing.mcpServers = {};
-        const mcpServers = existing.mcpServers;
-        const envVars = { EBAY_ENVIRONMENT: environment };
-        if (envConfig.EBAY_CLIENT_ID)
-            envVars.EBAY_CLIENT_ID = envConfig.EBAY_CLIENT_ID;
-        if (envConfig.EBAY_CLIENT_SECRET)
-            envVars.EBAY_CLIENT_SECRET = envConfig.EBAY_CLIENT_SECRET;
-        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;
-        if (envConfig.EBAY_USER_ACCESS_TOKEN?.startsWith('v^'))
-            envVars.EBAY_USER_ACCESS_TOKEN = envConfig.EBAY_USER_ACCESS_TOKEN;
-        if (envConfig.EBAY_APP_ACCESS_TOKEN?.startsWith('v^'))
-            envVars.EBAY_APP_ACCESS_TOKEN = envConfig.EBAY_APP_ACCESS_TOKEN;
-        mcpServers.ebay = {
-            command: 'npx',
-            args: ['--yes', '--quiet', 'ebay-mcp'],
-            env: { ...envVars, NODE_NO_WARNINGS: '1', NPM_CONFIG_UPDATE_NOTIFIER: 'false' },
-        };
-        writeFileSync(configPath, JSON.stringify(existing, null, 2));
-        const otherServers = Object.keys(mcpServers).filter((k) => k !== 'ebay');
-        return {
-            success: true,
-            configPath,
-            details: otherServers.length > 0
-                ? `Preserved ${otherServers.length} existing server(s): ${otherServers.join(', ')}`
-                : `Added ebay server (${Object.keys(mcpServers).length} total)`,
-        };
-    }
-    catch (error) {
+            if (!existing.mcpServers || typeof existing.mcpServers !== 'object')
+                existing.mcpServers = {};
+            const mcpServers = existing.mcpServers;
+            const envVars = { EBAY_ENVIRONMENT: environment };
+            if (envConfig.EBAY_CLIENT_ID)
+                envVars.EBAY_CLIENT_ID = envConfig.EBAY_CLIENT_ID;
+            if (envConfig.EBAY_CLIENT_SECRET)
+                envVars.EBAY_CLIENT_SECRET = envConfig.EBAY_CLIENT_SECRET;
+            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;
+            if (envConfig.EBAY_USER_ACCESS_TOKEN?.startsWith('v^'))
+                envVars.EBAY_USER_ACCESS_TOKEN = envConfig.EBAY_USER_ACCESS_TOKEN;
+            if (envConfig.EBAY_APP_ACCESS_TOKEN?.startsWith('v^'))
+                envVars.EBAY_APP_ACCESS_TOKEN = envConfig.EBAY_APP_ACCESS_TOKEN;
+            mcpServers.ebay = {
+                command: 'npx',
+                args: ['--yes', '--quiet', 'ebay-mcp'],
+                env: { ...envVars, NODE_NO_WARNINGS: '1', NPM_CONFIG_UPDATE_NOTIFIER: 'false' },
+            };
+            writeFileSync(configPath, JSON.stringify(existing, null, 2));
+            const otherServers = Object.keys(mcpServers).filter((k) => k !== 'ebay');
+            return {
+                success: true,
+                configPath,
+                details: otherServers.length > 0
+                    ? `Preserved ${otherServers.length} existing server(s): ${otherServers.join(', ')}`
+                    : `Added ebay server (${Object.keys(mcpServers).length} total)`,
+            };
+        },
+        catch: (error) => error,
+    })));
+    if (Either.isLeft(updated)) {
         return {
             success: false,
             configPath,
-            error: getErrorMessage(error, 'Unknown'),
+            error: getErrorMessage(updated.left, 'Unknown'),
         };
     }
+    return updated.right;
 }
 function formatDate(date) {
     return date.toLocaleString('en-US', {
@@ -333,8 +341,8 @@ function showSetupProgress(message) {
 function displayUserInfo(userInfo) {
     const name = userInfo.individualAccount?.firstName && userInfo.individualAccount?.lastName
         ? `${userInfo.individualAccount.firstName} ${userInfo.individualAccount.lastName}`
-        : userInfo.businessAccount?.name || 'N/A';
-    const email = userInfo.individualAccount?.email || userInfo.businessAccount?.email || 'N/A';
+        : userInfo.businessAccount?.name || 'No account name';
+    const email = userInfo.individualAccount?.email || userInfo.businessAccount?.email || 'No account email';
     const marketplaceMap = {
         EBAY_US: 'eBay United States',
         EBAY_GB: 'eBay United Kingdom',
@@ -347,12 +355,12 @@ function displayUserInfo(userInfo) {
     };
     const marketplace = marketplaceMap[userInfo.registrationMarketplaceId || ''] ||
         userInfo.registrationMarketplaceId ||
-        'N/A';
+        'No marketplace';
     console.log(`  ${ui.dim('┌─ eBay Account Verified ─────────────────────────')}`);
     console.log(`  ${ui.dim('│')} Username:     ${userInfo.username}`);
     console.log(`  ${ui.dim('│')} Name:         ${name}`);
     console.log(`  ${ui.dim('│')} Email:        ${email}`);
-    console.log(`  ${ui.dim('│')} Type:         ${userInfo.accountType || 'N/A'}`);
+    console.log(`  ${ui.dim('│')} Type:         ${userInfo.accountType || 'No account type'}`);
     console.log(`  ${ui.dim('│')} Marketplace:  ${marketplace}`);
     console.log(`  ${ui.dim('└─────────────────────────────────────────────────')}`);
     console.log('');
@@ -372,7 +380,7 @@ const DEFAULT_CALLBACK_PORT = 3000;
 function getCallbackPort() {
     const raw = process.env.EBAY_OAUTH_CALLBACK_PORT;
     const parsed = raw ? Number.parseInt(raw, 10) : Number.NaN;
-    return Number.isInteger(parsed) && parsed > 0 && parsed < 65536 ? parsed : DEFAULT_CALLBACK_PORT;
+    return Number.isInteger(parsed) && parsed > 0 && parsed < 65_536 ? parsed : DEFAULT_CALLBACK_PORT;
 }
 /**
  * Exchange an authorization code for tokens, verify the eBay account, mint an app
@@ -382,62 +390,76 @@ function getCallbackPort() {
 async function completeOAuthWithCode(authCode, params, tokens) {
     const { clientId, clientSecret, redirectUri, environment, answers } = params;
     const stopSpinner = showSetupProgress('Exchanging authorization code for tokens');
-    try {
-        const result = await exchangeAuthorizationCode(authCode, clientId, clientSecret, redirectUri, environment);
-        stopSpinner();
-        showSuccess('Authorization code exchanged successfully!');
-        tokens.refreshToken = result.refreshToken;
-        tokens.accessToken = result.accessToken;
-        try {
-            const userInfo = await fetchEbayUserInfo(result.accessToken, environment);
-            showSuccess('Account verified!');
-            displayUserInfo(userInfo);
-        }
-        catch (userError) {
-            const userMsg = describeHttpError(userError, 'Unknown');
-            showWarning(`Could not fetch account info: ${userMsg}`);
-            if (userMsg.toLowerCase().includes('access denied'))
-                showInfo('Normal if RuName lacks commerce.identity.readonly scope — tokens are valid.');
-        }
-        try {
-            tokens.appAccessToken = await getAppAccessToken(clientId, clientSecret, environment);
-            showSuccess('App access token obtained.');
-        }
-        catch {
-            showWarning('Could not obtain app access token (user tokens still work).');
-        }
-        showInfo(`Access token expires in: ${Math.floor(result.expiresIn / 60)} minutes`);
-        showInfo(`Refresh token expires in: ${Math.floor(result.refreshTokenExpiresIn / 60 / 60 / 24)} days`);
-        if (isClaudeDesktopInstalled()) {
-            const r = updateClaudeDesktopConfig({
-                ...answers,
-                EBAY_USER_REFRESH_TOKEN: tokens.refreshToken ?? '',
-                EBAY_USER_ACCESS_TOKEN: tokens.accessToken ?? '',
-            }, environment);
-            if (r.success) {
-                showSuccess('Claude Desktop config updated.');
-                if (r.details)
-                    showInfo(r.details);
-            }
-            else
-                showWarning(`Could not update Claude Desktop: ${r.error}`);
-        }
-    }
-    catch (error) {
-        stopSpinner();
-        const msg = describeHttpError(error, 'Unknown error');
+    const exchanged = await Effect.runPromise(Effect.either(Effect.tryPromise({
+        try: () => exchangeAuthorizationCode(authCode, clientId, clientSecret, redirectUri, environment),
+        catch: (error) => error,
+    }).pipe(Effect.ensuring(Effect.sync(stopSpinner)))));
+    if (Either.isLeft(exchanged)) {
+        const msg = describeHttpError(exchanged.left, 'Unknown error');
         showError(`Failed to exchange code: ${msg}`);
         console.log('  Common issues:');
         console.log('  • Authorization code expired (codes are valid for ~5 minutes)');
         console.log('  • Code was already used (each code can only be used once)');
         console.log('  • Redirect URI mismatch\n');
+        return;
+    }
+    const result = exchanged.right;
+    showSuccess('Authorization code exchanged successfully!');
+    tokens.refreshToken = result.refreshToken;
+    tokens.accessToken = result.accessToken;
+    const user = await Effect.runPromise(Effect.either(Effect.tryPromise({
+        try: () => fetchEbayUserInfo(result.accessToken, environment),
+        catch: (error) => error,
+    })));
+    if (Either.isRight(user)) {
+        showSuccess('Account verified!');
+        displayUserInfo(user.right);
+    }
+    else {
+        const userMsg = describeHttpError(user.left, 'Unknown');
+        showWarning(`Could not fetch account info: ${userMsg}`);
+        if (userMsg.toLowerCase().includes('access denied'))
+            showInfo('Normal if RuName lacks commerce.identity.readonly scope — tokens are valid.');
+    }
+    const appToken = await Effect.runPromise(Effect.either(Effect.tryPromise({
+        try: () => getAppAccessToken(clientId, clientSecret, environment),
+        catch: (error) => error,
+    })));
+    if (Either.isRight(appToken)) {
+        tokens.appAccessToken = appToken.right;
+        showSuccess('App access token obtained.');
+    }
+    else {
+        showWarning('Could not obtain app access token (user tokens still work).');
+    }
+    showInfo(`Access token expires in: ${Math.floor(result.expiresIn / 60)} minutes`);
+    showInfo(`Refresh token expires in: ${Math.floor(result.refreshTokenExpiresIn / 60 / 60 / 24)} days`);
+    if (isClaudeDesktopInstalled()) {
+        const r = updateClaudeDesktopConfig({
+            ...answers,
+            EBAY_USER_REFRESH_TOKEN: tokens.refreshToken ?? '',
+            EBAY_USER_ACCESS_TOKEN: tokens.accessToken ?? '',
+        }, environment);
+        if (r.success) {
+            showSuccess('Claude Desktop config updated.');
+            if (r.details)
+                showInfo(r.details);
+        }
+        else
+            showWarning(`Could not update Claude Desktop: ${r.error}`);
     }
 }
 // ─── Setup wizard ─────────────────────────────────────────────────────────────
 /**
  * Runs the interactive eBay MCP setup wizard from the script entry point.
+ *
+ * @returns A promise that resolves after setup completes.
+ * @example
+ * ```ts
+ * await runSetup();
+ * ```
  */
-export async function runSetup() {
+export const runSetup = async () => {
     const existingConfig = loadExistingConfig(PROJECT_ROOT);
     const detectedClients = detectLLMClients();
     const availableClients = detectedClients.filter((c) => c.detected);
@@ -604,8 +626,6 @@ export async function runSetup() {
         ],
     });
     const answers = await runWizard(wizardConfig, {
-        renderer: new ClackRenderer(),
-        quiet: true,
         optionsProvider: (stepId) => {
             if (stepId === 'oauth-method') {
                 const hasToken = existingConfig.EBAY_USER_REFRESH_TOKEN?.startsWith('v^1.1#');
@@ -623,7 +643,6 @@ export async function runSetup() {
                     ];
                 }
             }
-            return undefined;
         },
         asyncValidate: (stepId, value) => {
             if (stepId === 'oauth-token') {
@@ -658,18 +677,25 @@ export async function runSetup() {
                 switch (method) {
                     case 'keep': {
                         const stopSpinner = showSetupProgress('Verifying existing refresh token...');
-                        try {
-                            const { accessToken, userInfo } = await verifyRefreshToken(existingConfig.EBAY_USER_REFRESH_TOKEN, clientId, clientSecret, environment);
-                            stopSpinner();
+                        const verified = await Effect.runPromise(Effect.either(Effect.tryPromise({
+                            try: () => verifyRefreshToken(existingConfig.EBAY_USER_REFRESH_TOKEN, clientId, clientSecret, environment),
+                            catch: (error) => error,
+                        }).pipe(Effect.ensuring(Effect.sync(stopSpinner)))));
+                        if (Either.isRight(verified)) {
+                            const { accessToken, userInfo } = verified.right;
                             showSuccess('Refresh token verified!');
                             tokens.refreshToken = existingConfig.EBAY_USER_REFRESH_TOKEN;
                             tokens.accessToken = accessToken;
                             displayUserInfo(userInfo);
-                            try {
-                                tokens.appAccessToken = await getAppAccessToken(clientId, clientSecret, environment);
+                            const appToken = await Effect.runPromise(Effect.either(Effect.tryPromise({
+                                try: () => getAppAccessToken(clientId, clientSecret, environment),
+                                catch: (error) => error,
+                            })));
+                            if (Either.isRight(appToken)) {
+                                tokens.appAccessToken = appToken.right;
                                 showSuccess('App access token obtained.');
                             }
-                            catch {
+                            else {
                                 showWarning('Could not obtain app access token (user tokens still work).');
                             }
                             if (isClaudeDesktopInstalled()) {
@@ -686,9 +712,8 @@ export async function runSetup() {
                                     showWarning(`Could not update Claude Desktop: ${r.error}`);
                             }
                         }
-                        catch (error) {
-                            stopSpinner();
-                            const msg = describeHttpError(error, 'Unknown error');
+                        else {
+                            const msg = describeHttpError(verified.left, 'Unknown error');
                             showError(`Token verification failed: ${msg}`);
                             if (msg.toLowerCase().includes('access denied'))
                                 showWarning('Token may be missing required OAuth scopes.');
@@ -720,24 +745,52 @@ export async function runSetup() {
                             "The tunnel forwards eBay's redirect here, where the code is captured.",
                             'Override the local port with EBAY_OAUTH_CALLBACK_PORT.',
                         ].join('\n'));
-                        const authUrl = getOAuthAuthorizationUrl(clientId, redirectUri, environment, undefined, undefined, state);
+                        const authUrl = getOAuthAuthorizationUrl(clientId, redirectUri, environment, undefined, state);
                         let server;
                         const stopSpinner = showSetupProgress('Waiting for eBay to redirect back (up to 5 min)');
-                        try {
-                            const started = await startCallbackServer(callbackPort, 300000, {
-                                expectedState: state,
+                        const captured = await Effect.runPromise(Effect.either(Effect.gen(function* () {
+                            const started = yield* Effect.tryPromise({
+                                try: () => startCallbackServer(callbackPort, 300_000, {
+                                    expectedState: state,
+                                }),
+                                catch: (cause) => new SetupCaptureError({
+                                    message: 'Failed to start OAuth callback server',
+                                    cause,
+                                }),
                             });
                             server = started.server;
-                            await context.openBrowser(authUrl);
+                            yield* Effect.tryPromise({
+                                try: () => context.openBrowser(authUrl),
+                                catch: (cause) => new SetupCaptureError({
+                                    message: 'Failed to open OAuth authorization URL',
+                                    cause,
+                                }),
+                            });
                             showInfo('1. Sign in to your eBay account in the browser');
                             showInfo('2. Grant permissions to your app');
                             showInfo('3. eBay redirects back automatically — no copy-paste needed');
-                            const result = await started.codePromise;
+                            const result = yield* Effect.tryPromise({
+                                try: () => started.codePromise,
+                                catch: (cause) => new SetupCaptureError({
+                                    message: 'Failed while waiting for eBay OAuth redirect',
+                                    cause,
+                                }),
+                            });
+                            if (!result.code) {
+                                return yield* Effect.fail(new SetupCaptureError({
+                                    message: result.errorDescription ??
+                                        result.error ??
+                                        'No authorization code received',
+                                }));
+                            }
+                            return result.code;
+                        }).pipe(Effect.ensuring(Effect.sync(() => {
                             stopSpinner();
-                            if (!result.code)
-                                throw new Error(result.errorDescription ?? result.error ?? 'No authorization code received');
+                            server?.close();
+                        })))));
+                        if (Either.isRight(captured)) {
                             showSuccess('Authorization code captured automatically!');
-                            await completeOAuthWithCode(result.code, {
+                            await completeOAuthWithCode(captured.right, {
                                 clientId,
                                 clientSecret,
                                 redirectUri,
@@ -746,16 +799,12 @@ export async function runSetup() {
                             }, tokens);
                             context.setNextStep(finalStepId);
                         }
-                        catch (error) {
-                            stopSpinner();
-                            showError(`Auto-capture failed: ${getErrorMessage(error, 'Unknown error')}`);
+                        else {
+                            showError(`Auto-capture failed: ${getErrorMessage(captured.left, 'Unknown error')}`);
                             showInfo('Falling back to manual paste — copy the redirect URL from your browser.');
                             context.showNote('OAuth Authorization URL', authUrl);
                             context.setNextStep('oauth-code');
                         }
-                        finally {
-                            server?.close();
-                        }
                         break;
                     }
                     case 'manual': {
@@ -785,17 +834,24 @@ export async function runSetup() {
                     .replace(/^["']|["']$/g, '');
                 tokens.refreshToken = rawToken;
                 const stopSpinner = showSetupProgress('Verifying refresh token...');
-                try {
-                    const { accessToken, userInfo } = await verifyRefreshToken(rawToken, clientId, clientSecret, environment);
-                    stopSpinner();
+                const verified = await Effect.runPromise(Effect.either(Effect.tryPromise({
+                    try: () => verifyRefreshToken(rawToken, clientId, clientSecret, environment),
+                    catch: (error) => error,
+                }).pipe(Effect.ensuring(Effect.sync(stopSpinner)))));
+                if (Either.isRight(verified)) {
+                    const { accessToken, userInfo } = verified.right;
                     showSuccess('Refresh token verified!');
                     tokens.accessToken = accessToken;
                     displayUserInfo(userInfo);
-                    try {
-                        tokens.appAccessToken = await getAppAccessToken(clientId, clientSecret, environment);
+                    const appToken = await Effect.runPromise(Effect.either(Effect.tryPromise({
+                        try: () => getAppAccessToken(clientId, clientSecret, environment),
+                        catch: (error) => error,
+                    })));
+                    if (Either.isRight(appToken)) {
+                        tokens.appAccessToken = appToken.right;
                         showSuccess('App access token obtained.');
                     }
-                    catch {
+                    else {
                         showWarning('Could not obtain app access token (user tokens still work).');
                     }
                     if (isClaudeDesktopInstalled()) {
@@ -809,9 +865,8 @@ export async function runSetup() {
                             showWarning(`Could not update Claude Desktop: ${r.error}`);
                     }
                 }
-                catch (error) {
-                    stopSpinner();
-                    const msg = describeHttpError(error, 'Unknown error');
+                else {
+                    const msg = describeHttpError(verified.left, 'Unknown error');
                     showError(`Token verification failed: ${msg}`);
                     showWarning("Token saved anyway — you may need to re-authenticate if it doesn't work.");
                 }
@@ -864,6 +919,13 @@ export async function runSetup() {
         ? answers['content-language-custom']
         : answers['content-language'];
     const environment = answers.environment;
+    const refreshTokenConfig = {};
+    if (tokens.refreshToken) {
+        refreshTokenConfig.EBAY_USER_REFRESH_TOKEN = tokens.refreshToken;
+    }
+    else if (existingConfig.EBAY_USER_REFRESH_TOKEN) {
+        refreshTokenConfig.EBAY_USER_REFRESH_TOKEN = existingConfig.EBAY_USER_REFRESH_TOKEN;
+    }
     const finalConfig = {
         EBAY_CLIENT_ID: answers['client-id'],
         EBAY_CLIENT_SECRET: answers['client-secret'] || existingConfig.EBAY_CLIENT_SECRET || '',
@@ -871,11 +933,7 @@ export async function runSetup() {
         EBAY_ENVIRONMENT: environment,
         ...(marketplaceId ? { EBAY_MARKETPLACE_ID: marketplaceId } : {}),
         ...(contentLanguage ? { EBAY_CONTENT_LANGUAGE: contentLanguage } : {}),
-        ...(tokens.refreshToken
-            ? { EBAY_USER_REFRESH_TOKEN: tokens.refreshToken }
-            : existingConfig.EBAY_USER_REFRESH_TOKEN
-                ? { EBAY_USER_REFRESH_TOKEN: existingConfig.EBAY_USER_REFRESH_TOKEN }
-                : {}),
+        ...refreshTokenConfig,
         ...(tokens.accessToken ? { EBAY_USER_ACCESS_TOKEN: tokens.accessToken } : {}),
         ...(tokens.appAccessToken ? { EBAY_APP_ACCESS_TOKEN: tokens.appAccessToken } : {}),
     };
@@ -926,17 +984,17 @@ export async function runSetup() {
             showInfo('You can install them later with: npm run skills');
         }
     }
-}
+};
 // ─── Entry point ──────────────────────────────────────────────────────────────
-function parseArgs() {
+const parseArgs = () => {
     const args = process.argv.slice(2);
     return {
         help: args.includes('--help') || args.includes('-h'),
         quick: args.includes('--quick') || args.includes('-q'),
         diagnose: args.includes('--diagnose') || args.includes('-d'),
     };
-}
-function showHelp() {
+};
+const showHelp = () => {
     console.log(`
 ${chalk.bold('eBay MCP Server Setup')}  ${chalk.dim('interactive setup')}
 
@@ -953,8 +1011,8 @@ ${chalk.bold('Examples:')}
   npm run setup --quick      Skip optional configuration
   npm run setup --diagnose   Check system health
 `);
-}
-async function main() {
+};
+const main = async () => {
     const args = parseArgs();
     if (args.help) {
         showHelp();
@@ -970,7 +1028,7 @@ async function main() {
         process.exit(0);
     }
     await runSetup();
-}
+};
 process.on('SIGINT', () => {
     console.log(ui.warning('\n\n  Setup interrupted.\n'));
     process.exit(0);
@@ -978,8 +1036,13 @@ process.on('SIGINT', () => {
 const entryPath = process.argv[1] ? resolve(process.argv[1]) : undefined;
 const modulePath = resolve(fileURLToPath(import.meta.url));
 if (entryPath && modulePath === entryPath) {
-    main().catch((error) => {
-        console.error(ui.error('\n  Setup failed:'), error);
-        process.exit(1);
+    void Effect.runPromise(Effect.either(Effect.tryPromise({
+        try: () => main(),
+        catch: (error) => error,
+    }))).then((result) => {
+        if (Either.isLeft(result)) {
+            console.error(ui.error('\n  Setup failed:'), getErrorMessage(result.left));
+            process.exitCode = 1;
+        }
     });
 }