@apify/mcpc 0.1.4 → 0.1.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.claude/settings.local.json +31 -1
- package/.idea/codeStyles/Project.xml +4 -1
- package/.idea/workspace.xml +308 -276
- package/README.md +666 -521
- package/dist/bridge/index.js +78 -3
- package/dist/bridge/index.js.map +1 -1
- package/dist/bridge/proxy-server.d.ts +22 -0
- package/dist/bridge/proxy-server.d.ts.map +1 -0
- package/dist/bridge/proxy-server.js +161 -0
- package/dist/bridge/proxy-server.js.map +1 -0
- package/dist/cli/commands/clean.js +8 -8
- package/dist/cli/commands/clean.js.map +1 -1
- package/dist/cli/commands/logging.js +1 -1
- package/dist/cli/commands/logging.js.map +1 -1
- package/dist/cli/commands/prompts.d.ts.map +1 -1
- package/dist/cli/commands/prompts.js +13 -4
- package/dist/cli/commands/prompts.js.map +1 -1
- package/dist/cli/commands/resources.js +5 -5
- package/dist/cli/commands/resources.js.map +1 -1
- package/dist/cli/commands/sessions.d.ts +2 -0
- package/dist/cli/commands/sessions.d.ts.map +1 -1
- package/dist/cli/commands/sessions.js +68 -57
- package/dist/cli/commands/sessions.js.map +1 -1
- package/dist/cli/commands/tools.d.ts +0 -1
- package/dist/cli/commands/tools.d.ts.map +1 -1
- package/dist/cli/commands/tools.js +9 -9
- package/dist/cli/commands/tools.js.map +1 -1
- package/dist/cli/commands/utilities.js +1 -1
- package/dist/cli/commands/utilities.js.map +1 -1
- package/dist/cli/helpers.d.ts +7 -2
- package/dist/cli/helpers.d.ts.map +1 -1
- package/dist/cli/helpers.js +31 -14
- package/dist/cli/helpers.js.map +1 -1
- package/dist/cli/index.js +75 -45
- package/dist/cli/index.js.map +1 -1
- package/dist/cli/output.d.ts.map +1 -1
- package/dist/cli/output.js +87 -5
- package/dist/cli/output.js.map +1 -1
- package/dist/cli/parser.d.ts +6 -1
- package/dist/cli/parser.d.ts.map +1 -1
- package/dist/cli/parser.js +78 -53
- package/dist/cli/parser.js.map +1 -1
- package/dist/cli/shell.d.ts.map +1 -1
- package/dist/cli/shell.js +27 -13
- package/dist/cli/shell.js.map +1 -1
- package/dist/core/factory.d.ts.map +1 -1
- package/dist/core/factory.js +1 -0
- package/dist/core/factory.js.map +1 -1
- package/dist/core/mcp-client.d.ts +5 -0
- package/dist/core/mcp-client.d.ts.map +1 -1
- package/dist/core/mcp-client.js +76 -26
- package/dist/core/mcp-client.js.map +1 -1
- package/dist/lib/auth/keychain.d.ts +3 -0
- package/dist/lib/auth/keychain.d.ts.map +1 -1
- package/dist/lib/auth/keychain.js +18 -0
- package/dist/lib/auth/keychain.js.map +1 -1
- package/dist/lib/auth/oauth-flow.d.ts.map +1 -1
- package/dist/lib/auth/oauth-flow.js +52 -12
- package/dist/lib/auth/oauth-flow.js.map +1 -1
- package/dist/lib/bridge-manager.d.ts +2 -1
- package/dist/lib/bridge-manager.d.ts.map +1 -1
- package/dist/lib/bridge-manager.js +25 -6
- package/dist/lib/bridge-manager.js.map +1 -1
- package/dist/lib/errors.d.ts +6 -1
- package/dist/lib/errors.d.ts.map +1 -1
- package/dist/lib/errors.js +13 -1
- package/dist/lib/errors.js.map +1 -1
- package/dist/lib/logger.d.ts +2 -0
- package/dist/lib/logger.d.ts.map +1 -1
- package/dist/lib/logger.js +10 -0
- package/dist/lib/logger.js.map +1 -1
- package/dist/lib/schema-validator.d.ts.map +1 -1
- package/dist/lib/schema-validator.js +45 -0
- package/dist/lib/schema-validator.js.map +1 -1
- package/dist/lib/sessions.d.ts +1 -1
- package/dist/lib/sessions.d.ts.map +1 -1
- package/dist/lib/sessions.js +31 -10
- package/dist/lib/sessions.js.map +1 -1
- package/dist/lib/types.d.ts +18 -1
- package/dist/lib/types.d.ts.map +1 -1
- package/dist/lib/utils.d.ts.map +1 -1
- package/dist/lib/utils.js +5 -1
- package/dist/lib/utils.js.map +1 -1
- package/docs/README.md +19 -0
- package/docs/TODOs.md +40 -0
- package/docs/claude-skill/SKILL.md +53 -28
- package/docs/images/mcpc-screenshot.png +0 -0
- package/package.json +4 -3
- package/PUBLISHING.md +0 -111
- package/TODOs.md +0 -46
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prompts.js","sourceRoot":"","sources":["../../../src/cli/commands/prompts.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC3D,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"prompts.js","sourceRoot":"","sources":["../../../src/cli/commands/prompts.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { formatOutput, formatSuccess } from '../output.js';
|
|
2
2
|
import { withMcpClient } from '../helpers.js';
|
|
3
3
|
export async function listResources(target, options) {
|
|
4
|
-
await withMcpClient(target, options, async (client) => {
|
|
4
|
+
await withMcpClient(target, options, async (client, _context) => {
|
|
5
5
|
const allResources = [];
|
|
6
6
|
let cursor = undefined;
|
|
7
7
|
do {
|
|
@@ -13,7 +13,7 @@ export async function listResources(target, options) {
|
|
|
13
13
|
});
|
|
14
14
|
}
|
|
15
15
|
export async function listResourceTemplates(target, options) {
|
|
16
|
-
await withMcpClient(target, options, async (client) => {
|
|
16
|
+
await withMcpClient(target, options, async (client, _context) => {
|
|
17
17
|
const allTemplates = [];
|
|
18
18
|
let cursor = undefined;
|
|
19
19
|
do {
|
|
@@ -25,7 +25,7 @@ export async function listResourceTemplates(target, options) {
|
|
|
25
25
|
});
|
|
26
26
|
}
|
|
27
27
|
export async function getResource(target, uri, options) {
|
|
28
|
-
await withMcpClient(target, options, async (client) => {
|
|
28
|
+
await withMcpClient(target, options, async (client, _context) => {
|
|
29
29
|
const result = await client.readResource(uri);
|
|
30
30
|
if (options.output) {
|
|
31
31
|
throw new Error('--output flag not implemented yet');
|
|
@@ -46,7 +46,7 @@ export async function getResource(target, uri, options) {
|
|
|
46
46
|
});
|
|
47
47
|
}
|
|
48
48
|
export async function subscribeResource(target, uri, options) {
|
|
49
|
-
await withMcpClient(target, options, async (client) => {
|
|
49
|
+
await withMcpClient(target, options, async (client, _context) => {
|
|
50
50
|
await client.subscribeResource(uri);
|
|
51
51
|
if (options.outputMode === 'human') {
|
|
52
52
|
console.log(formatSuccess(`Subscribed to resource: ${uri}`));
|
|
@@ -57,7 +57,7 @@ export async function subscribeResource(target, uri, options) {
|
|
|
57
57
|
});
|
|
58
58
|
}
|
|
59
59
|
export async function unsubscribeResource(target, uri, options) {
|
|
60
|
-
await withMcpClient(target, options, async (client) => {
|
|
60
|
+
await withMcpClient(target, options, async (client, _context) => {
|
|
61
61
|
await client.unsubscribeResource(uri);
|
|
62
62
|
if (options.outputMode === 'human') {
|
|
63
63
|
console.log(formatSuccess(`Unsubscribed from resource: ${uri}`));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resources.js","sourceRoot":"","sources":["../../../src/cli/commands/resources.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC3D,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAO9C,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,MAAc,EAAE,OAAuB;IACzE,MAAM,aAAa,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;
|
|
1
|
+
{"version":3,"file":"resources.js","sourceRoot":"","sources":["../../../src/cli/commands/resources.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,8 @@ export declare function connectSession(name: string, target: string, options: {
|
|
|
6
6
|
headers?: string[];
|
|
7
7
|
timeout?: number;
|
|
8
8
|
profile?: string;
|
|
9
|
+
proxy?: string;
|
|
10
|
+
proxyBearerToken?: string;
|
|
9
11
|
}): Promise<void>;
|
|
10
12
|
export declare function listSessionsAndAuthProfiles(options: {
|
|
11
13
|
outputMode: OutputMode;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sessions.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/sessions.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"sessions.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/sessions.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,UAAU,EAAyF,MAAM,oBAAoB,CAAC;AAoDvI,wBAAsB,cAAc,CAClC,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,EACd,OAAO,EAAE;IACP,UAAU,EAAE,UAAU,CAAC;IACvB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B,GACA,OAAO,CAAC,IAAI,CAAC,CAiMf;AAwDD,wBAAsB,2BAA2B,CAAC,OAAO,EAAE;IAAE,UAAU,EAAE,UAAU,CAAA;CAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CA4EpG;AAKD,wBAAsB,YAAY,CAChC,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE;IAAE,UAAU,EAAE,UAAU,CAAA;CAAE,GAClC,OAAO,CAAC,IAAI,CAAC,CA4Cf;AAKD,wBAAsB,iBAAiB,CACrC,MAAM,EAAE,MAAM,EACd,OAAO,EAAE;IACP,UAAU,EAAE,UAAU,CAAC;IACvB,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;CACtB,GACA,OAAO,CAAC,IAAI,CAAC,CAkCf;AAKD,wBAAsB,cAAc,CAClC,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE;IAAE,UAAU,EAAE,UAAU,CAAC;IAAC,OAAO,CAAC,EAAE,OAAO,CAAA;CAAE,GACrD,OAAO,CAAC,IAAI,CAAC,CAkFf;AAKD,wBAAsB,QAAQ,CAC5B,MAAM,EAAE,MAAM,EACd,OAAO,EAAE;IAAE,UAAU,EAAE,UAAU,CAAA;CAAE,GAClC,OAAO,CAAC,IAAI,CAAC,CAEf;AAKD,wBAAsB,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAI7D"}
|
|
@@ -1,14 +1,35 @@
|
|
|
1
|
+
import { createServer } from 'net';
|
|
1
2
|
import { isValidSessionName, validateProfileName, isProcessAlive, getServerHost, redactHeaders } from '../../lib/index.js';
|
|
2
3
|
import { formatOutput, formatSuccess, formatError, formatSessionLine, formatServerDetails } from '../output.js';
|
|
4
|
+
import { withMcpClient, resolveTarget, resolveAuthProfile } from '../helpers.js';
|
|
3
5
|
import { listAuthProfiles } from '../../lib/auth/profiles.js';
|
|
4
6
|
import { sessionExists, deleteSession, saveSession, updateSession, consolidateSessions, getSession, } from '../../lib/sessions.js';
|
|
5
7
|
import { startBridge, stopBridge } from '../../lib/bridge-manager.js';
|
|
6
|
-
import { storeKeychainSessionHeaders } from '../../lib/auth/keychain.js';
|
|
7
|
-
import { resolveTarget, resolveAuthProfile } from '../helpers.js';
|
|
8
|
+
import { storeKeychainSessionHeaders, storeKeychainProxyBearerToken } from '../../lib/auth/keychain.js';
|
|
8
9
|
import { ClientError } from '../../lib/index.js';
|
|
9
10
|
import chalk from 'chalk';
|
|
10
11
|
import { createLogger } from '../../lib/logger.js';
|
|
12
|
+
import { parseProxyArg } from '../parser.js';
|
|
11
13
|
const logger = createLogger('sessions');
|
|
14
|
+
async function checkPortAvailable(host, port) {
|
|
15
|
+
return new Promise((resolve) => {
|
|
16
|
+
const server = createServer();
|
|
17
|
+
server.once('error', (err) => {
|
|
18
|
+
if (err.code === 'EADDRINUSE') {
|
|
19
|
+
resolve(false);
|
|
20
|
+
}
|
|
21
|
+
else {
|
|
22
|
+
resolve(false);
|
|
23
|
+
}
|
|
24
|
+
});
|
|
25
|
+
server.once('listening', () => {
|
|
26
|
+
server.close(() => {
|
|
27
|
+
resolve(true);
|
|
28
|
+
});
|
|
29
|
+
});
|
|
30
|
+
server.listen(port, host);
|
|
31
|
+
});
|
|
32
|
+
}
|
|
12
33
|
export async function connectSession(name, target, options) {
|
|
13
34
|
try {
|
|
14
35
|
if (!isValidSessionName(name)) {
|
|
@@ -18,6 +39,19 @@ export async function connectSession(name, target, options) {
|
|
|
18
39
|
if (options.profile) {
|
|
19
40
|
validateProfileName(options.profile);
|
|
20
41
|
}
|
|
42
|
+
let proxyConfig;
|
|
43
|
+
if (options.proxy) {
|
|
44
|
+
proxyConfig = parseProxyArg(options.proxy);
|
|
45
|
+
logger.debug(`Proxy config: ${proxyConfig.host}:${proxyConfig.port}`);
|
|
46
|
+
const portAvailable = await checkPortAvailable(proxyConfig.host, proxyConfig.port);
|
|
47
|
+
if (!portAvailable) {
|
|
48
|
+
throw new ClientError(`Port ${proxyConfig.port} is already in use on ${proxyConfig.host}. ` +
|
|
49
|
+
`Choose a different port with --proxy [host:]port`);
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
if (options.proxyBearerToken && !options.proxy) {
|
|
53
|
+
throw new ClientError('--proxy-bearer-token requires --proxy to be specified');
|
|
54
|
+
}
|
|
21
55
|
const existingSession = await getSession(name);
|
|
22
56
|
if (existingSession) {
|
|
23
57
|
const bridgeStatus = getBridgeStatus(existingSession);
|
|
@@ -57,15 +91,20 @@ export async function connectSession(name, target, options) {
|
|
|
57
91
|
headers = undefined;
|
|
58
92
|
}
|
|
59
93
|
}
|
|
94
|
+
if (options.proxyBearerToken) {
|
|
95
|
+
logger.debug(`Storing proxy bearer token for session ${name} in keychain`);
|
|
96
|
+
await storeKeychainProxyBearerToken(name, options.proxyBearerToken);
|
|
97
|
+
}
|
|
60
98
|
const isReconnect = !!existingSession;
|
|
61
99
|
const { headers: _originalHeaders, ...baseTransportConfig } = serverConfig;
|
|
62
100
|
const sessionTransportConfig = {
|
|
63
101
|
...baseTransportConfig,
|
|
64
|
-
...(headers &&
|
|
102
|
+
...(headers && { headers: redactHeaders(headers) }),
|
|
65
103
|
};
|
|
66
104
|
const sessionUpdate = {
|
|
67
105
|
server: sessionTransportConfig,
|
|
68
106
|
...(profileName && { profileName }),
|
|
107
|
+
...(proxyConfig && { proxy: proxyConfig }),
|
|
69
108
|
};
|
|
70
109
|
if (isReconnect) {
|
|
71
110
|
await updateSession(name, sessionUpdate);
|
|
@@ -87,6 +126,9 @@ export async function connectSession(name, target, options) {
|
|
|
87
126
|
if (profileName) {
|
|
88
127
|
bridgeOptions.profileName = profileName;
|
|
89
128
|
}
|
|
129
|
+
if (proxyConfig) {
|
|
130
|
+
bridgeOptions.proxyConfig = proxyConfig;
|
|
131
|
+
}
|
|
90
132
|
const { pid } = await startBridge(bridgeOptions);
|
|
91
133
|
await updateSession(name, { pid });
|
|
92
134
|
logger.debug(`Session ${name} updated with bridge PID: ${pid}`);
|
|
@@ -115,7 +157,7 @@ export async function connectSession(name, target, options) {
|
|
|
115
157
|
console.error(formatError(error.message));
|
|
116
158
|
}
|
|
117
159
|
else {
|
|
118
|
-
console.
|
|
160
|
+
console.error(formatOutput({
|
|
119
161
|
sessionName: name,
|
|
120
162
|
target,
|
|
121
163
|
created: false,
|
|
@@ -130,7 +172,7 @@ function getBridgeStatus(session) {
|
|
|
130
172
|
return 'expired';
|
|
131
173
|
}
|
|
132
174
|
if (!session.pid || !isProcessAlive(session.pid)) {
|
|
133
|
-
return '
|
|
175
|
+
return 'crashed';
|
|
134
176
|
}
|
|
135
177
|
return 'live';
|
|
136
178
|
}
|
|
@@ -138,8 +180,8 @@ function formatBridgeStatus(status) {
|
|
|
138
180
|
switch (status) {
|
|
139
181
|
case 'live':
|
|
140
182
|
return { dot: chalk.green('●'), text: chalk.green('live') };
|
|
141
|
-
case '
|
|
142
|
-
return { dot: chalk.yellow('○'), text: chalk.yellow('
|
|
183
|
+
case 'crashed':
|
|
184
|
+
return { dot: chalk.yellow('○'), text: chalk.yellow('crashed') };
|
|
143
185
|
case 'expired':
|
|
144
186
|
return { dot: chalk.red('○'), text: chalk.red('expired') };
|
|
145
187
|
}
|
|
@@ -251,7 +293,7 @@ export async function closeSession(name, options) {
|
|
|
251
293
|
console.error(formatError(error.message));
|
|
252
294
|
}
|
|
253
295
|
else {
|
|
254
|
-
console.
|
|
296
|
+
console.error(formatOutput({
|
|
255
297
|
sessionName: name,
|
|
256
298
|
closed: false,
|
|
257
299
|
error: error.message,
|
|
@@ -261,61 +303,27 @@ export async function closeSession(name, options) {
|
|
|
261
303
|
}
|
|
262
304
|
}
|
|
263
305
|
export async function showServerDetails(target, options) {
|
|
264
|
-
|
|
265
|
-
await withMcpClient(target, options, async (client) => {
|
|
306
|
+
await withMcpClient(target, options, async (client, context) => {
|
|
266
307
|
const serverDetails = await client.getServerDetails();
|
|
267
308
|
const { serverInfo, capabilities, instructions, protocolVersion } = serverDetails;
|
|
268
309
|
if (options.outputMode === 'human') {
|
|
269
310
|
console.log(formatServerDetails(serverDetails, target));
|
|
270
311
|
}
|
|
271
312
|
else {
|
|
272
|
-
const
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
};
|
|
277
|
-
}
|
|
278
|
-
if (capabilities?.resources) {
|
|
279
|
-
jsonCapabilities.resources = {
|
|
280
|
-
subscribe: capabilities.resources.subscribe || false,
|
|
281
|
-
listChanged: capabilities.resources.listChanged || false,
|
|
282
|
-
};
|
|
283
|
-
}
|
|
284
|
-
if (capabilities?.prompts) {
|
|
285
|
-
jsonCapabilities.prompts = {
|
|
286
|
-
listChanged: capabilities.prompts.listChanged || false,
|
|
287
|
-
};
|
|
288
|
-
}
|
|
289
|
-
if (capabilities?.logging) {
|
|
290
|
-
jsonCapabilities.logging = {};
|
|
291
|
-
}
|
|
292
|
-
if (capabilities?.completions) {
|
|
293
|
-
jsonCapabilities.completions = {};
|
|
294
|
-
}
|
|
295
|
-
const availableCommands = [];
|
|
296
|
-
if (capabilities?.tools) {
|
|
297
|
-
availableCommands.push('tools-list', 'tools-get', 'tools-call');
|
|
298
|
-
}
|
|
299
|
-
if (capabilities?.resources) {
|
|
300
|
-
availableCommands.push('resources-list', 'resources-read');
|
|
301
|
-
if (capabilities.resources.subscribe) {
|
|
302
|
-
availableCommands.push('resources-subscribe', 'resources-unsubscribe');
|
|
303
|
-
}
|
|
304
|
-
}
|
|
305
|
-
if (capabilities?.prompts) {
|
|
306
|
-
availableCommands.push('prompts-list', 'prompts-get');
|
|
307
|
-
}
|
|
308
|
-
if (capabilities?.logging) {
|
|
309
|
-
availableCommands.push('logging-set-level');
|
|
310
|
-
}
|
|
311
|
-
availableCommands.push('shell');
|
|
313
|
+
const server = {
|
|
314
|
+
...context.serverConfig,
|
|
315
|
+
...(context.serverConfig?.headers && { headers: redactHeaders(context.serverConfig.headers) }),
|
|
316
|
+
};
|
|
312
317
|
console.log(formatOutput({
|
|
313
|
-
|
|
314
|
-
|
|
315
|
-
|
|
316
|
-
|
|
317
|
-
|
|
318
|
-
|
|
318
|
+
_mcpc: {
|
|
319
|
+
sessionName: context.sessionName,
|
|
320
|
+
profileName: context.profileName,
|
|
321
|
+
server,
|
|
322
|
+
},
|
|
323
|
+
protocolVersion,
|
|
324
|
+
capabilities,
|
|
325
|
+
serverInfo,
|
|
326
|
+
instructions,
|
|
319
327
|
}, 'json'));
|
|
320
328
|
}
|
|
321
329
|
});
|
|
@@ -351,6 +359,9 @@ export async function restartSession(name, options) {
|
|
|
351
359
|
if (session.profileName) {
|
|
352
360
|
bridgeOptions.profileName = session.profileName;
|
|
353
361
|
}
|
|
362
|
+
if (session.proxy) {
|
|
363
|
+
bridgeOptions.proxyConfig = session.proxy;
|
|
364
|
+
}
|
|
354
365
|
const { pid } = await startBridge(bridgeOptions);
|
|
355
366
|
await updateSession(name, { pid });
|
|
356
367
|
logger.debug(`Session ${name} restarted with bridge PID: ${pid}`);
|
|
@@ -367,7 +378,7 @@ export async function restartSession(name, options) {
|
|
|
367
378
|
console.error(formatError(error.message));
|
|
368
379
|
}
|
|
369
380
|
else {
|
|
370
|
-
console.
|
|
381
|
+
console.error(formatOutput({
|
|
371
382
|
sessionName: name,
|
|
372
383
|
restarted: false,
|
|
373
384
|
error: error.message,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sessions.js","sourceRoot":"","sources":["../../../src/cli/commands/sessions.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"sessions.js","sourceRoot":"","sources":["../../../src/cli/commands/sessions.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,5 @@ export declare function listTools(target: string, options: CommandOptions): Prom
|
|
|
3
3
|
export declare function getTool(target: string, name: string, options: CommandOptions): Promise<void>;
|
|
4
4
|
export declare function callTool(target: string, name: string, options: CommandOptions & {
|
|
5
5
|
args?: string[];
|
|
6
|
-
argsFile?: string;
|
|
7
6
|
}): Promise<void>;
|
|
8
7
|
//# sourceMappingURL=tools.d.ts.map
|
|
@@ -1 +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,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CActF;AAKD,wBAAsB,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CA0ClG;
|
|
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,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CActF;AAKD,wBAAsB,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CA0ClG;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,CAwDf"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import { formatOutput, formatToolDetail, formatSuccess, formatWarning } from '../output.js';
|
|
2
2
|
import { ClientError } from '../../lib/errors.js';
|
|
3
3
|
import { withMcpClient } from '../helpers.js';
|
|
4
|
-
import { parseCommandArgs,
|
|
4
|
+
import { parseCommandArgs, hasStdinData, readStdinArgs } from '../parser.js';
|
|
5
5
|
import { loadSchemaFromFile, validateToolSchema, formatValidationError, } from '../../lib/schema-validator.js';
|
|
6
6
|
export async function listTools(target, options) {
|
|
7
|
-
await withMcpClient(target, options, async (client) => {
|
|
7
|
+
await withMcpClient(target, options, async (client, _context) => {
|
|
8
8
|
const allTools = [];
|
|
9
9
|
let cursor = undefined;
|
|
10
10
|
do {
|
|
@@ -20,7 +20,7 @@ export async function getTool(target, name, options) {
|
|
|
20
20
|
if (options.schema) {
|
|
21
21
|
expectedSchema = (await loadSchemaFromFile(options.schema));
|
|
22
22
|
}
|
|
23
|
-
await withMcpClient(target, options, async (client) => {
|
|
23
|
+
await withMcpClient(target, options, async (client, _context) => {
|
|
24
24
|
const result = await client.listTools();
|
|
25
25
|
const tool = result.tools.find((t) => t.name === name);
|
|
26
26
|
if (!tool) {
|
|
@@ -48,20 +48,20 @@ export async function getTool(target, name, options) {
|
|
|
48
48
|
}
|
|
49
49
|
export async function callTool(target, name, options) {
|
|
50
50
|
let parsedArgs;
|
|
51
|
-
if (options.
|
|
52
|
-
|
|
51
|
+
if (options.args && options.args.length > 0) {
|
|
52
|
+
parsedArgs = parseCommandArgs(options.args);
|
|
53
53
|
}
|
|
54
|
-
if (
|
|
55
|
-
parsedArgs =
|
|
54
|
+
else if (hasStdinData()) {
|
|
55
|
+
parsedArgs = await readStdinArgs();
|
|
56
56
|
}
|
|
57
57
|
else {
|
|
58
|
-
parsedArgs =
|
|
58
|
+
parsedArgs = {};
|
|
59
59
|
}
|
|
60
60
|
let expectedSchema;
|
|
61
61
|
if (options.schema) {
|
|
62
62
|
expectedSchema = (await loadSchemaFromFile(options.schema));
|
|
63
63
|
}
|
|
64
|
-
await withMcpClient(target, options, async (client) => {
|
|
64
|
+
await withMcpClient(target, options, async (client, _context) => {
|
|
65
65
|
const schemaMode = options.schemaMode || 'compatible';
|
|
66
66
|
if (expectedSchema && schemaMode !== 'ignore') {
|
|
67
67
|
const result = await client.listTools();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tools.js","sourceRoot":"","sources":["../../../src/cli/commands/tools.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC5F,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAElD,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,EAAE,gBAAgB,EAAE,
|
|
1
|
+
{"version":3,"file":"tools.js","sourceRoot":"","sources":["../../../src/cli/commands/tools.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { formatSuccess, formatOutput } from '../output.js';
|
|
2
2
|
import { withMcpClient } from '../helpers.js';
|
|
3
3
|
export async function ping(target, options) {
|
|
4
|
-
await withMcpClient(target, options, async (client) => {
|
|
4
|
+
await withMcpClient(target, options, async (client, _context) => {
|
|
5
5
|
const startTime = performance.now();
|
|
6
6
|
await client.ping();
|
|
7
7
|
const endTime = performance.now();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utilities.js","sourceRoot":"","sources":["../../../src/cli/commands/utilities.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAC3D,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAM9C,MAAM,CAAC,KAAK,UAAU,IAAI,CAAC,MAAc,EAAE,OAAuB;IAChE,MAAM,aAAa,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;
|
|
1
|
+
{"version":3,"file":"utilities.js","sourceRoot":"","sources":["../../../src/cli/commands/utilities.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAC3D,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAM9C,MAAM,CAAC,KAAK,UAAU,IAAI,CAAC,MAAc,EAAE,OAAuB;IAChE,MAAM,aAAa,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE;QAC9D,MAAM,SAAS,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC;QACpC,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;QACpB,MAAM,OAAO,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC;QAClC,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,GAAG,SAAS,CAAC,CAAC;QAEnD,IAAI,OAAO,CAAC,UAAU,KAAK,OAAO,EAAE,CAAC;YACnC,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,oBAAoB,UAAU,KAAK,CAAC,CAAC,CAAC;QAClE,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,GAAG,CACT,YAAY,CACV;gBACE,OAAO,EAAE,IAAI;gBACb,UAAU;aACX,EACD,MAAM,CACP,CACF,CAAC;QACJ,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC"}
|
package/dist/cli/helpers.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { IMcpClient, OutputMode, ServerConfig } from '../lib/types.js';
|
|
2
2
|
export declare function resolveAuthProfile(serverUrl: string, target: string, specifiedProfile?: string, context?: {
|
|
3
3
|
sessionName?: string;
|
|
4
|
-
}): Promise<string>;
|
|
4
|
+
}): Promise<string | undefined>;
|
|
5
5
|
export declare function resolveTarget(target: string, options?: {
|
|
6
6
|
config?: string;
|
|
7
7
|
headers?: string[];
|
|
@@ -9,6 +9,11 @@ export declare function resolveTarget(target: string, options?: {
|
|
|
9
9
|
verbose?: boolean;
|
|
10
10
|
profile?: string;
|
|
11
11
|
}): Promise<ServerConfig>;
|
|
12
|
+
export interface McpClientContext {
|
|
13
|
+
sessionName?: string | undefined;
|
|
14
|
+
profileName?: string | undefined;
|
|
15
|
+
serverConfig?: ServerConfig | undefined;
|
|
16
|
+
}
|
|
12
17
|
export declare function withMcpClient<T>(target: string, options: {
|
|
13
18
|
outputMode?: OutputMode;
|
|
14
19
|
config?: string;
|
|
@@ -17,5 +22,5 @@ export declare function withMcpClient<T>(target: string, options: {
|
|
|
17
22
|
verbose?: boolean;
|
|
18
23
|
hideTarget?: boolean;
|
|
19
24
|
profile?: string;
|
|
20
|
-
}, callback: (client: IMcpClient) => Promise<T>): Promise<T>;
|
|
25
|
+
}, callback: (client: IMcpClient, context: McpClientContext) => Promise<T>): Promise<T>;
|
|
21
26
|
//# sourceMappingURL=helpers.d.ts.map
|
|
@@ -1 +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;
|
|
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;AA0F5E,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;CAClB,EACD,QAAQ,EAAE,CAAC,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,gBAAgB,KAAK,OAAO,CAAC,CAAC,CAAC,GACtE,OAAO,CAAC,CAAC,CAAC,CA+HZ"}
|
package/dist/cli/helpers.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { createMcpClient } from '../core/factory.js';
|
|
2
|
-
import { ClientError, NetworkError, AuthError } from '../lib/errors.js';
|
|
2
|
+
import { ClientError, NetworkError, AuthError, isAuthenticationError, createServerAuthError } from '../lib/errors.js';
|
|
3
3
|
import { normalizeServerUrl, isValidSessionName, getServerHost } from '../lib/utils.js';
|
|
4
4
|
import { setVerbose, createLogger } from '../lib/logger.js';
|
|
5
5
|
import { loadConfig, getServerConfig, validateServerConfig } from '../lib/config.js';
|
|
@@ -75,18 +75,13 @@ export async function resolveAuthProfile(serverUrl, target, specifiedProfile, co
|
|
|
75
75
|
const allProfiles = await listAuthProfiles();
|
|
76
76
|
const serverProfiles = allProfiles.filter(p => getServerHost(p.serverUrl) === host);
|
|
77
77
|
if (serverProfiles.length === 0) {
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
: `Then run your command again.`;
|
|
81
|
-
throw new ClientError(`No authentication profile found for ${host}.\n\n` +
|
|
82
|
-
`To authenticate, run:\n` +
|
|
83
|
-
` mcpc ${target} login\n\n` +
|
|
84
|
-
sessionHint);
|
|
78
|
+
logger.debug(`No auth profiles for ${host}, attempting unauthenticated connection`);
|
|
79
|
+
return undefined;
|
|
85
80
|
}
|
|
86
81
|
else {
|
|
87
82
|
const profileNames = serverProfiles.map(p => p.name).join(', ');
|
|
88
83
|
const commandHint = context?.sessionName
|
|
89
|
-
? `mcpc ${target}
|
|
84
|
+
? `mcpc ${target} connect ${context.sessionName} --profile <name>`
|
|
90
85
|
: `mcpc ${target} <command> --profile <name>`;
|
|
91
86
|
throw new ClientError(`No default authentication profile for ${host}.\n\n` +
|
|
92
87
|
`Available profiles: ${profileNames}\n\n` +
|
|
@@ -136,14 +131,21 @@ export async function resolveTarget(target, options = {}) {
|
|
|
136
131
|
export async function withMcpClient(target, options, callback) {
|
|
137
132
|
if (isValidSessionName(target)) {
|
|
138
133
|
const { withSessionClient } = await import('../lib/session-client.js');
|
|
134
|
+
const { getSession } = await import('../lib/sessions.js');
|
|
139
135
|
logger.debug('Using session:', target);
|
|
136
|
+
const session = await getSession(target);
|
|
137
|
+
const context = {
|
|
138
|
+
sessionName: session?.name,
|
|
139
|
+
profileName: session?.profileName,
|
|
140
|
+
serverConfig: session?.server,
|
|
141
|
+
};
|
|
140
142
|
if (options.outputMode) {
|
|
141
143
|
await logTarget(target, {
|
|
142
144
|
outputMode: options.outputMode,
|
|
143
145
|
hide: options.hideTarget,
|
|
144
146
|
});
|
|
145
147
|
}
|
|
146
|
-
return await withSessionClient(target, callback);
|
|
148
|
+
return await withSessionClient(target, (client) => callback(client, context));
|
|
147
149
|
}
|
|
148
150
|
const serverConfig = await resolveTarget(target, options);
|
|
149
151
|
logger.debug('Resolved target:', { target, serverConfig });
|
|
@@ -168,7 +170,17 @@ export async function withMcpClient(target, options, callback) {
|
|
|
168
170
|
logger.debug(`Using auth profile: ${profileName}`);
|
|
169
171
|
}
|
|
170
172
|
}
|
|
171
|
-
|
|
173
|
+
let client;
|
|
174
|
+
try {
|
|
175
|
+
client = await createMcpClient(clientConfig);
|
|
176
|
+
}
|
|
177
|
+
catch (error) {
|
|
178
|
+
const errorMessage = error.message || '';
|
|
179
|
+
if (isAuthenticationError(errorMessage)) {
|
|
180
|
+
throw createServerAuthError(target, { originalError: error });
|
|
181
|
+
}
|
|
182
|
+
throw new NetworkError(`Failed to connect to MCP server: ${errorMessage}`, { originalError: error });
|
|
183
|
+
}
|
|
172
184
|
try {
|
|
173
185
|
logger.debug('Connected successfully');
|
|
174
186
|
if (options.outputMode) {
|
|
@@ -177,18 +189,23 @@ export async function withMcpClient(target, options, callback) {
|
|
|
177
189
|
outputMode: options.outputMode,
|
|
178
190
|
hide: options.hideTarget,
|
|
179
191
|
profileName,
|
|
180
|
-
serverConfig
|
|
192
|
+
serverConfig,
|
|
181
193
|
protocolVersion: serverDetails.protocolVersion,
|
|
182
194
|
});
|
|
183
195
|
}
|
|
184
|
-
const
|
|
196
|
+
const context = { serverConfig, profileName };
|
|
197
|
+
const result = await callback(client, context);
|
|
185
198
|
return result;
|
|
186
199
|
}
|
|
187
200
|
catch (error) {
|
|
188
201
|
logger.error('MCP operation failed:', error);
|
|
189
|
-
if (error instanceof NetworkError || error instanceof ClientError) {
|
|
202
|
+
if (error instanceof NetworkError || error instanceof ClientError || error instanceof AuthError) {
|
|
190
203
|
throw error;
|
|
191
204
|
}
|
|
205
|
+
const errorMessage = error.message || '';
|
|
206
|
+
if (isAuthenticationError(errorMessage)) {
|
|
207
|
+
throw createServerAuthError(target, { originalError: error });
|
|
208
|
+
}
|
|
192
209
|
throw new NetworkError(`Failed to communicate with MCP server: ${error.message}`, { originalError: error });
|
|
193
210
|
}
|
|
194
211
|
finally {
|