@apify/mcpc 0.1.11 → 0.2.0-beta.1

package/dist/cli/commands/tools.d.ts

@@ -5,5 +5,7 @@ export declare function listTools(target: string, options: CommandOptions & {
 export declare function getTool(target: string, name: string, options: CommandOptions): Promise<void>;
 export declare function callTool(target: string, name: string, options: CommandOptions & {
     args?: string[];
+    task?: boolean;
+    detach?: boolean;
 }): Promise<void>;
 //# sourceMappingURL=tools.d.ts.map

package/dist/cli/commands/tools.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tools.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/tools.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAgBzD,wBAAsB,SAAS,CAC7B,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,cAAc,GAAG;IAAE,IAAI,CAAC,EAAE,OAAO,CAAA;CAAE,GAC3C,OAAO,CAAC,IAAI,CAAC,CAgBf;AAKD,wBAAsB,OAAO,CAC3B,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,IAAI,CAAC,CA0Cf;AAQD,wBAAsB,QAAQ,CAC5B,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,cAAc,GAAG;IACxB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;CACjB,GACA,OAAO,CAAC,IAAI,CAAC,CA6Df"}
+{"version":3,"file":"tools.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/tools.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,cAAc,EAAc,MAAM,oBAAoB,CAAC;AAgBrE,wBAAsB,SAAS,CAC7B,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,cAAc,GAAG;IAAE,IAAI,CAAC,EAAE,OAAO,CAAA;CAAE,GAC3C,OAAO,CAAC,IAAI,CAAC,CAUf;AAKD,wBAAsB,OAAO,CAC3B,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,cAAc,GACtB,OAAO,CAAC,IAAI,CAAC,CA6Cf;AA+ED,wBAAsB,QAAQ,CAC5B,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,cAAc,GAAG;IACxB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB,GACA,OAAO,CAAC,IAAI,CAAC,CAmLf"}

package/dist/cli/commands/tools.js

@@ -1,3 +1,5 @@
+import ora from 'ora';
+import chalk from 'chalk';
 import { formatOutput, formatToolDetail, formatSuccess, formatWarning } from '../output.js';
 import { ClientError } from '../../lib/errors.js';
 import { withMcpClient } from '../helpers.js';
@@ -5,14 +7,11 @@ import { parseCommandArgs, hasStdinData, readStdinArgs } from '../parser.js';
 import { loadSchemaFromFile, validateToolSchema, formatValidationError, } from '../../lib/schema-validator.js';
 export async function listTools(target, options) {
     await withMcpClient(target, options, async (client, _context) => {
-        const allTools = [];
-        let cursor = undefined;
-        do {
-            const result = await client.listTools(cursor);
-            allTools.push(...result.tools);
-            cursor = result.nextCursor;
-        } while (cursor);
-        console.log(formatOutput(allTools, options.outputMode, options.full ? { full: true } : undefined));
+        const result = await client.listAllTools({ refreshCache: true });
+        console.log(formatOutput(result.tools, options.outputMode, {
+            ...(options.full && { full: true }),
+            sessionName: target,
+        }));
     });
 }
 export async function getTool(target, name, options) {
@@ -21,8 +20,12 @@ export async function getTool(target, name, options) {
         expectedSchema = (await loadSchemaFromFile(options.schema));
     }
     await withMcpClient(target, options, async (client, _context) => {
-        const result = await client.listTools();
-        const tool = result.tools.find((t) => t.name === name);
+        let result = await client.listAllTools();
+        let tool = result.tools.find((t) => t.name === name);
+        if (!tool) {
+            result = await client.listAllTools({ refreshCache: true });
+            tool = result.tools.find((t) => t.name === name);
+        }
         if (!tool) {
             throw new ClientError(`Tool not found: ${name}`);
         }
@@ -46,6 +49,50 @@ export async function getTool(target, name, options) {
         }
     });
 }
+function formatElapsed(ms) {
+    const totalSeconds = Math.floor(ms / 1000);
+    const hours = Math.floor(totalSeconds / 3600);
+    const minutes = Math.floor((totalSeconds % 3600) / 60);
+    const seconds = totalSeconds % 60;
+    if (hours > 0) {
+        return `${hours}:${String(minutes).padStart(2, '0')}:${String(seconds).padStart(2, '0')}`;
+    }
+    return `${minutes}:${String(seconds).padStart(2, '0')}`;
+}
+async function shouldUseTask(client, async_) {
+    if (!async_)
+        return false;
+    const details = await client.getServerDetails();
+    return !!details.capabilities?.tasks?.requests?.tools?.call;
+}
+function setupEscListener(enabled, canDetach) {
+    if (!enabled || !process.stdin.isTTY) {
+        return { promise: null, cleanup: () => { } };
+    }
+    const ESC = '\x1b';
+    let cleaned = false;
+    let cleanupFn = () => { };
+    const promise = new Promise((resolve) => {
+        const onData = (key) => {
+            if (key.toString() === ESC && canDetach()) {
+                cleanupFn();
+                resolve('detached');
+            }
+        };
+        process.stdin.setRawMode(true);
+        process.stdin.resume();
+        process.stdin.on('data', onData);
+        cleanupFn = () => {
+            if (cleaned)
+                return;
+            cleaned = true;
+            process.stdin.off('data', onData);
+            process.stdin.setRawMode(false);
+            process.stdin.pause();
+        };
+    });
+    return { promise, cleanup: () => cleanupFn() };
+}
 export async function callTool(target, name, options) {
     let parsedArgs;
     if (options.args && options.args.length > 0) {
@@ -79,9 +126,108 @@ export async function callTool(target, name, options) {
                 }
             }
         }
-        const result = await client.callTool(name, parsedArgs);
+        const taskRequested = options.detach || options.task;
+        const useTask = await shouldUseTask(client, taskRequested);
+        if (taskRequested && !useTask) {
+            if (options.outputMode === 'human') {
+                console.log(formatWarning('Server does not support tasks, falling back to synchronous execution'));
+            }
+        }
+        let result;
+        if (useTask && options.detach) {
+            const taskUpdate = await client.callToolDetached(name, parsedArgs);
+            if (options.outputMode === 'human') {
+                console.log(formatSuccess(`Task started: ${taskUpdate.taskId}`));
+            }
+            else {
+                console.log(formatOutput({ taskId: taskUpdate.taskId, status: taskUpdate.status }, 'json'));
+            }
+            return;
+        }
+        else if (useTask) {
+            const startTime = Date.now();
+            let spinner = null;
+            let timerInterval = null;
+            let lastStatusMessage;
+            let lastProgressMessage;
+            let capturedTaskId;
+            const updateSpinnerText = () => {
+                if (!spinner)
+                    return;
+                const elapsed = formatElapsed(Date.now() - startTime);
+                const progressSuffix = lastProgressMessage ? ` ${chalk.dim(lastProgressMessage)}` : '';
+                const statusSuffix = !lastProgressMessage && lastStatusMessage ? ` ${chalk.dim(lastStatusMessage)}` : '';
+                const escHint = capturedTaskId && escListener.promise ? ` ${chalk.dim('(ESC to detach)')}` : '';
+                spinner.text = `Running tool ${chalk.bold(name)}... (${elapsed})${progressSuffix}${statusSuffix}${escHint}`;
+            };
+            if (options.outputMode === 'human') {
+                spinner = ora({
+                    text: `Running tool ${chalk.bold(name)}... (0:00)`,
+                    color: 'cyan',
+                }).start();
+                timerInterval = setInterval(updateSpinnerText, 1000);
+            }
+            const onUpdate = (update) => {
+                if (update.taskId) {
+                    capturedTaskId = update.taskId;
+                }
+                if (update.statusMessage) {
+                    lastStatusMessage = update.statusMessage;
+                }
+                if (update.progressMessage) {
+                    lastProgressMessage = update.progressMessage;
+                }
+                if (spinner) {
+                    updateSpinnerText();
+                }
+            };
+            const escListener = setupEscListener(options.outputMode === 'human' && !process.stdin.isRaw, () => !!capturedTaskId);
+            try {
+                const taskPromise = client.callToolWithTask(name, parsedArgs, onUpdate);
+                if (escListener.promise) {
+                    const raceResult = await Promise.race([
+                        taskPromise.then((r) => ({ type: 'completed', result: r })),
+                        escListener.promise.then(() => ({ type: 'detached' })),
+                    ]);
+                    escListener.cleanup();
+                    if (raceResult.type === 'detached') {
+                        if (timerInterval)
+                            clearInterval(timerInterval);
+                        if (spinner) {
+                            spinner.info(`Detached. Task ${chalk.bold(capturedTaskId)} continues in background`);
+                        }
+                        return;
+                    }
+                    result = raceResult.result;
+                }
+                else {
+                    result = await taskPromise;
+                }
+                const elapsed = formatElapsed(Date.now() - startTime);
+                if (spinner) {
+                    spinner.succeed(`Tool ${chalk.bold(name)} executed successfully (${elapsed})`);
+                }
+            }
+            catch (error) {
+                escListener.cleanup();
+                const elapsed = formatElapsed(Date.now() - startTime);
+                if (spinner) {
+                    spinner.fail(`Tool ${chalk.bold(name)} failed (${elapsed})`);
+                }
+                throw error;
+            }
+            finally {
+                if (timerInterval)
+                    clearInterval(timerInterval);
+            }
+        }
+        else {
+            result = await client.callTool(name, parsedArgs);
+            if (options.outputMode === 'human') {
+                console.log(formatSuccess(`Tool ${name} executed successfully`));
+            }
+        }
         if (options.outputMode === 'human') {
-            console.log(formatSuccess(`Tool ${name} executed successfully`));
             console.log(formatOutput(result, 'human'));
         }
         else {

package/dist/cli/commands/tools.js.map

@@ -1 +1 @@
-{"version":3,"file":"tools.js","sourceRoot":"","sources":["../../../src/cli/commands/tools.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"tools.js","sourceRoot":"","sources":["../../../src/cli/commands/tools.ts"],"names":[],"mappings":"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"}

package/dist/cli/commands/x402.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"x402.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/x402.ts"],"names":[],"mappings":"AAqOA,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAyErE"}
+{"version":3,"file":"x402.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/x402.ts"],"names":[],"mappings":"AAqOA,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAwFrE"}

package/dist/cli/commands/x402.js

@@ -141,8 +141,22 @@ async function signPaymentCommand(options) {
 }
 export async function handleX402Command(args) {
     const program = new Command();
-    program.name('mcpc x402').description('x402 wallet management and payment signing');
-    program.option('-j, --json', 'Output in JSON format').option('--verbose', 'Enable debug logging');
+    program
+        .name('mcpc x402')
+        .description('x402 wallet management and payment signing (EXPERIMENTAL)');
+    program.configureHelp({
+        styleTitle: (str) => chalk.bold(str),
+        styleSubcommandText: (str) => chalk.cyan(str),
+    });
+    program
+        .option('-j, --json', 'Output in JSON format')
+        .option('--verbose', 'Enable debug logging')
+        .helpOption('-h, --help', 'Display help')
+        .helpCommand('help [command]', 'Display help for command')
+        .addHelpText('after', `
+${chalk.bold('sign options:')}
+  --amount <usd>      Override amount in USD
+  --expiry <seconds>  Override expiry in seconds`);
     const resolveOutputMode = (cmd) => {
         const opts = cmd.optsWithGlobals();
         return opts.json ? 'json' : 'human';
@@ -172,14 +186,14 @@ export async function handleX402Command(args) {
         await removeWalletCmd({ outputMode: resolveOutputMode(cmd) });
     });
     program
-        .command('sign')
+        .command('sign <payment-required>')
         .description('Sign a payment using the wallet')
-        .requiredOption('-r, --payment-required <base64>', 'PAYMENT-REQUIRED header from a 402 response')
+        .helpOption('-h, --help', 'Display help')
         .option('--amount <usd>', 'Override amount in USD')
         .option('--expiry <seconds>', 'Override expiry in seconds')
-        .action(async (opts, cmd) => {
+        .action(async (paymentRequired, opts, cmd) => {
         await signPaymentCommand({
-            paymentRequired: opts.paymentRequired,
+            paymentRequired,
             amount: opts.amount,
             expiry: opts.expiry,
             outputMode: resolveOutputMode(cmd),

package/dist/cli/commands/x402.js.map

@@ -1 +1 @@
-{"version":3,"file":"x402.js","sourceRoot":"","sources":["../../../src/cli/commands/x402.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"x402.js","sourceRoot":"","sources":["../../../src/cli/commands/x402.ts"],"names":[],"mappings":"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"}

package/dist/cli/helpers.d.ts

@@ -1,5 +1,5 @@
 import type { IMcpClient, OutputMode, ServerConfig } from '../lib/types.js';
-export declare function resolveAuthProfile(serverUrl: string, target: string, specifiedProfile?: string, context?: {
+export declare function resolveAuthProfile(serverUrl: string, target: string, specifiedProfile?: string, _context?: {
     sessionName?: string;
 }): Promise<string | undefined>;
 export declare function resolveTarget(target: string, options?: {
@@ -16,12 +16,8 @@ export interface McpClientContext {
 }
 export declare function withMcpClient<T>(target: string, options: {
     outputMode?: OutputMode;
-    config?: string;
-    headers?: string[];
-    timeout?: number;
     verbose?: boolean;
     hideTarget?: boolean;
-    profile?: string;
-    x402?: boolean;
+    timeout?: number;
 }, callback: (client: IMcpClient, context: McpClientContext) => Promise<T>): Promise<T>;
 //# sourceMappingURL=helpers.d.ts.map

package/dist/cli/helpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../src/cli/helpers.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAsG5E,wBAAsB,kBAAkB,CACtC,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,EACd,gBAAgB,CAAC,EAAE,MAAM,EACzB,OAAO,CAAC,EAAE;IAAE,WAAW,CAAC,EAAE,MAAM,CAAA;CAAE,GACjC,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CA6C7B;AAWD,wBAAsB,aAAa,CACjC,MAAM,EAAE,MAAM,EACd,OAAO,GAAE;IACP,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;CACb,GACL,OAAO,CAAC,YAAY,CAAC,CAmDvB;AAKD,MAAM,WAAW,gBAAgB;IAC/B,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC,YAAY,CAAC,EAAE,YAAY,GAAG,SAAS,CAAC;CACzC;AAYD,wBAAsB,aAAa,CAAC,CAAC,EACnC,MAAM,EAAE,MAAM,EACd,OAAO,EAAE;IACP,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB,EACD,QAAQ,EAAE,CAAC,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,gBAAgB,KAAK,OAAO,CAAC,CAAC,CAAC,GACtE,OAAO,CAAC,CAAC,CAAC,CAyJZ"}
+{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../src/cli/helpers.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAwB5E,wBAAsB,kBAAkB,CACtC,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,EACd,gBAAgB,CAAC,EAAE,MAAM,EACzB,QAAQ,CAAC,EAAE;IAAE,WAAW,CAAC,EAAE,MAAM,CAAA;CAAE,GAClC,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CA4B7B;AAWD,wBAAsB,aAAa,CACjC,MAAM,EAAE,MAAM,EACd,OAAO,GAAE;IACP,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;CACb,GACL,OAAO,CAAC,YAAY,CAAC,CAiDvB;AAKD,MAAM,WAAW,gBAAgB;IAC/B,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC,YAAY,CAAC,EAAE,YAAY,GAAG,SAAS,CAAC;CACzC;AAUD,wBAAsB,aAAa,CAAC,CAAC,EACnC,MAAM,EAAE,MAAM,EACd,OAAO,EAAE;IACP,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,EACD,QAAQ,EAAE,CAAC,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,gBAAgB,KAAK,OAAO,CAAC,CAAC,CAAC,GACtE,OAAO,CAAC,CAAC,CAAC,CAkCZ"}

package/dist/cli/helpers.js

@@ -1,72 +1,20 @@
-import { createMcpClient } from '../core/factory.js';
-import { ClientError, NetworkError, AuthError, McpError, isAuthenticationError, createServerAuthError, } from '../lib/errors.js';
+import { ClientError } from '../lib/errors.js';
 import { normalizeServerUrl, isValidSessionName, getServerHost } from '../lib/utils.js';
 import { setVerbose, createLogger } from '../lib/logger.js';
 import { loadConfig, getServerConfig, validateServerConfig } from '../lib/config.js';
-import { OAuthProvider } from '../lib/auth/oauth-provider.js';
-import { OAuthTokenManager } from '../lib/auth/oauth-token-manager.js';
-import { getAuthProfile, listAuthProfiles } from '../lib/auth/profiles.js';
-import { readKeychainOAuthTokenInfo, readKeychainOAuthClientInfo } from '../lib/auth/keychain.js';
+import { getAuthProfile } from '../lib/auth/profiles.js';
 import { logTarget } from './output.js';
-import { getWallet } from '../lib/wallets.js';
-import { createX402FetchMiddleware } from '../lib/x402/fetch-middleware.js';
-import { createRequire } from 'module';
-const { version: mcpcVersion } = createRequire(import.meta.url)('../../package.json');
 import { DEFAULT_AUTH_PROFILE } from '../lib/auth/oauth-utils.js';
 import { parseHeaderFlags } from './parser.js';
 const logger = createLogger('cli');
-async function createAuthProviderForServer(url, profileName = DEFAULT_AUTH_PROFILE) {
-    try {
-        const profile = await getAuthProfile(url, profileName);
-        if (!profile) {
-            logger.debug(`No auth profile found for ${url} (profile: ${profileName})`);
-            return undefined;
-        }
-        const tokens = await readKeychainOAuthTokenInfo(url, profileName);
-        if (!tokens?.refreshToken) {
-            logger.debug(`No refresh token in keychain for profile: ${profileName}`);
-            return undefined;
-        }
-        const clientInfo = await readKeychainOAuthClientInfo(url, profileName);
-        if (!clientInfo?.clientId) {
-            logger.warn(`OAuth client ID not found in keychain for profile: ${profileName}`);
-            return undefined;
-        }
-        const tokenManagerOptions = {
-            serverUrl: url,
-            profileName,
-            clientId: clientInfo.clientId,
-            refreshToken: tokens.refreshToken,
-            accessToken: tokens.accessToken,
-        };
-        if (tokens.expiresAt !== undefined) {
-            tokenManagerOptions.accessTokenExpiresAt = tokens.expiresAt;
-        }
-        const tokenManager = new OAuthTokenManager(tokenManagerOptions);
-        logger.debug(`Created OAuthProvider for profile: ${profileName}`);
-        return new OAuthProvider({
-            serverUrl: url,
-            profileName,
-            tokenManager,
-            clientId: clientInfo.clientId,
-        });
-    }
-    catch (error) {
-        if (error instanceof AuthError) {
-            throw error;
-        }
-        logger.warn(`Failed to create auth provider: ${error.message}`);
-        return undefined;
-    }
-}
-export async function resolveAuthProfile(serverUrl, target, specifiedProfile, context) {
+export async function resolveAuthProfile(serverUrl, target, specifiedProfile, _context) {
     const host = getServerHost(serverUrl);
     if (specifiedProfile) {
         const profile = await getAuthProfile(serverUrl, specifiedProfile);
         if (!profile) {
             throw new ClientError(`Authentication profile "${specifiedProfile}" not found for ${host}.\n\n` +
                 `To create this profile, run:\n` +
-                `  mcpc ${target} login --profile ${specifiedProfile}`);
+                `  mcpc login ${target} --profile ${specifiedProfile}`);
         }
         return specifiedProfile;
     }
@@ -75,22 +23,8 @@ export async function resolveAuthProfile(serverUrl, target, specifiedProfile, co
         logger.debug(`Using default auth profile for ${host}`);
         return DEFAULT_AUTH_PROFILE;
     }
-    const allProfiles = await listAuthProfiles();
-    const serverProfiles = allProfiles.filter((p) => getServerHost(p.serverUrl) === host);
-    if (serverProfiles.length === 0) {
-        logger.debug(`No auth profiles for ${host}, attempting unauthenticated connection`);
-        return undefined;
-    }
-    else {
-        const profileNames = serverProfiles.map((p) => p.name).join(', ');
-        const commandHint = context?.sessionName
-            ? `mcpc ${target} connect ${context.sessionName} --profile <name>`
-            : `mcpc ${target} <command> --profile <name>`;
-        throw new ClientError(`No default authentication profile for ${host}.\n\n` +
-            `Available profiles: ${profileNames}\n\n` +
-            `To use a profile, run:\n` +
-            `  ${commandHint}`);
-    }
+    logger.debug(`No default auth profile for ${host}, attempting unauthenticated connection`);
+    return undefined;
 }
 export async function resolveTarget(target, options = {}) {
     if (options.verbose) {
@@ -118,10 +52,7 @@ export async function resolveTarget(target, options = {}) {
     }
     catch (error) {
         throw new ClientError(`Failed to resolve target: ${target}\n` +
-            `Target must be one of:\n` +
-            `  - Named session (@name)\n` +
-            `  - Server URL (e.g., mcp.apify.com or https://mcp.apify.com)\n` +
-            `  - Entry in JSON config file specified by --config flag\n\n` +
+            `Target must be a server URL (e.g., mcp.apify.com or https://mcp.apify.com)\n\n` +
             `Error: ${error.message}`);
     }
     const headers = parseHeaderFlags(options.headers);
@@ -132,117 +63,28 @@ export async function resolveTarget(target, options = {}) {
     };
 }
 export async function withMcpClient(target, options, callback) {
-    if (isValidSessionName(target)) {
-        const { withSessionClient } = await import('../lib/session-client.js');
-        const { getSession } = await import('../lib/sessions.js');
-        logger.debug('Using session:', target);
-        const session = await getSession(target);
-        const context = {
-            sessionName: session?.name,
-            profileName: session?.profileName,
-            serverConfig: session?.server,
-        };
-        if (options.outputMode) {
-            await logTarget(target, {
-                outputMode: options.outputMode,
-                hide: options.hideTarget,
-            });
-        }
-        return await withSessionClient(target, (client) => callback(client, context));
-    }
-    const serverConfig = await resolveTarget(target, options);
-    logger.debug('Resolved target:', { target, serverConfig });
-    const clientConfig = {
-        clientInfo: { name: 'mcpc', version: mcpcVersion },
-        serverConfig,
-        capabilities: {
-            roots: { listChanged: true },
-            sampling: {},
-        },
-        autoConnect: true,
+    if (!isValidSessionName(target)) {
+        throw new ClientError(`Invalid session name: ${target}\n` +
+            `Session names must start with @ (e.g. @apify).\n\n` +
+            `To create a session, run:\n` +
+            `  mcpc connect <server> @my-session`);
+    }
+    const { withSessionClient } = await import('../lib/session-client.js');
+    const { getSession } = await import('../lib/sessions.js');
+    logger.debug('Using session:', target);
+    const session = await getSession(target);
+    const context = {
+        sessionName: session?.name,
+        profileName: session?.profileName,
+        serverConfig: session?.server,
     };
-    if (options.verbose) {
-        clientConfig.verbose = true;
-    }
-    let profileName;
-    if (serverConfig.url) {
-        profileName = await resolveAuthProfile(serverConfig.url, target, options.profile);
-        const authProvider = await createAuthProviderForServer(serverConfig.url, profileName);
-        if (authProvider) {
-            clientConfig.authProvider = authProvider;
-            logger.debug(`Using auth profile: ${profileName}`);
-        }
-        if (options.x402) {
-            const wallet = await getWallet();
-            if (!wallet) {
-                throw new ClientError('x402 wallet not found. Create one with: mcpc x402 init');
-            }
-            logger.debug(`Using x402 wallet: ${wallet.address}`);
-            clientConfig.customFetch = createX402FetchMiddleware(fetch, {
-                wallet: { privateKey: wallet.privateKey, address: wallet.address },
-            });
-        }
-    }
-    let client;
-    try {
-        client = await createMcpClient(clientConfig);
-    }
-    catch (error) {
-        const errorMessage = error.message || '';
-        if (isAuthenticationError(errorMessage)) {
-            throw createServerAuthError(target, { originalError: error });
-        }
-        if (error instanceof NetworkError) {
-            const serverUrl = serverConfig.url ?? target;
-            const causeMsg = error.message.replace(/^Failed to connect to MCP server: /, '');
-            throw new NetworkError(`Failed to connect to MCP server "${serverUrl}": ${causeMsg}`, error.details);
-        }
-        if (error instanceof McpError)
-            throw error;
-        throw new NetworkError(`Failed to connect to ${serverConfig.url ?? target}: ${errorMessage}`, {
-            originalError: error,
-        });
-    }
-    try {
-        logger.debug('Connected successfully');
-        if (options.outputMode) {
-            const serverDetails = await client.getServerDetails();
-            await logTarget(target, {
-                outputMode: options.outputMode,
-                hide: options.hideTarget,
-                profileName,
-                serverConfig,
-                protocolVersion: serverDetails.protocolVersion,
-            });
-        }
-        const context = { serverConfig, profileName };
-        const result = await callback(client, context);
-        return result;
-    }
-    catch (error) {
-        logger.error('MCP operation failed:', error);
-        if (error instanceof NetworkError ||
-            error instanceof ClientError ||
-            error instanceof AuthError) {
-            throw error;
-        }
-        const errorMessage = error.message || '';
-        if (isAuthenticationError(errorMessage)) {
-            throw createServerAuthError(target, { originalError: error });
-        }
-        throw new NetworkError(`Failed to communicate with MCP server: ${error.message}`, {
-            originalError: error,
+    if (options.outputMode) {
+        await logTarget(target, {
+            outputMode: options.outputMode,
+            hide: options.hideTarget,
         });
     }
-    finally {
-        try {
-            logger.debug('Closing connection...');
-            await client.close();
-            logger.debug('Connection closed');
-        }
-        catch (error) {
-            logger.warn('Error closing connection:', error);
-        }
-    }
+    const sessionOpts = options.timeout !== undefined ? { timeout: options.timeout } : undefined;
+    return await withSessionClient(target, (client) => callback(client, context), sessionOpts);
 }
 //# sourceMappingURL=helpers.js.map