@apify/mcpc 0.1.3 → 0.1.5

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.
Files changed (122) hide show
  1. package/.claude/settings.local.json +53 -1
  2. package/.idea/codeStyles/Project.xml +7 -0
  3. package/.idea/workspace.xml +314 -280
  4. package/CONTRIBUTING.md +210 -0
  5. package/README.md +690 -763
  6. package/dist/bridge/index.js +82 -18
  7. package/dist/bridge/index.js.map +1 -1
  8. package/dist/bridge/proxy-server.d.ts +21 -0
  9. package/dist/bridge/proxy-server.d.ts.map +1 -0
  10. package/dist/bridge/proxy-server.js +160 -0
  11. package/dist/bridge/proxy-server.js.map +1 -0
  12. package/dist/cli/commands/auth.d.ts.map +1 -1
  13. package/dist/cli/commands/auth.js +9 -4
  14. package/dist/cli/commands/auth.js.map +1 -1
  15. package/dist/cli/commands/clean.d.ts.map +1 -1
  16. package/dist/cli/commands/clean.js +21 -27
  17. package/dist/cli/commands/clean.js.map +1 -1
  18. package/dist/cli/commands/logging.js +1 -1
  19. package/dist/cli/commands/logging.js.map +1 -1
  20. package/dist/cli/commands/prompts.d.ts.map +1 -1
  21. package/dist/cli/commands/prompts.js +37 -5
  22. package/dist/cli/commands/prompts.js.map +1 -1
  23. package/dist/cli/commands/resources.js +5 -5
  24. package/dist/cli/commands/resources.js.map +1 -1
  25. package/dist/cli/commands/sessions.d.ts +7 -1
  26. package/dist/cli/commands/sessions.d.ts.map +1 -1
  27. package/dist/cli/commands/sessions.js +130 -189
  28. package/dist/cli/commands/sessions.js.map +1 -1
  29. package/dist/cli/commands/tools.d.ts +0 -1
  30. package/dist/cli/commands/tools.d.ts.map +1 -1
  31. package/dist/cli/commands/tools.js +48 -10
  32. package/dist/cli/commands/tools.js.map +1 -1
  33. package/dist/cli/commands/utilities.js +1 -1
  34. package/dist/cli/commands/utilities.js.map +1 -1
  35. package/dist/cli/helpers.d.ts +9 -4
  36. package/dist/cli/helpers.d.ts.map +1 -1
  37. package/dist/cli/helpers.js +62 -81
  38. package/dist/cli/helpers.js.map +1 -1
  39. package/dist/cli/index.js +104 -46
  40. package/dist/cli/index.js.map +1 -1
  41. package/dist/cli/output.d.ts +19 -3
  42. package/dist/cli/output.d.ts.map +1 -1
  43. package/dist/cli/output.js +374 -82
  44. package/dist/cli/output.js.map +1 -1
  45. package/dist/cli/parser.d.ts +10 -1
  46. package/dist/cli/parser.d.ts.map +1 -1
  47. package/dist/cli/parser.js +155 -43
  48. package/dist/cli/parser.js.map +1 -1
  49. package/dist/cli/shell.d.ts.map +1 -1
  50. package/dist/cli/shell.js +31 -18
  51. package/dist/cli/shell.js.map +1 -1
  52. package/dist/core/factory.d.ts +2 -4
  53. package/dist/core/factory.d.ts.map +1 -1
  54. package/dist/core/factory.js +3 -34
  55. package/dist/core/factory.js.map +1 -1
  56. package/dist/core/mcp-client.d.ts +7 -2
  57. package/dist/core/mcp-client.d.ts.map +1 -1
  58. package/dist/core/mcp-client.js +86 -36
  59. package/dist/core/mcp-client.js.map +1 -1
  60. package/dist/core/transports.d.ts +2 -2
  61. package/dist/core/transports.d.ts.map +1 -1
  62. package/dist/core/transports.js +36 -45
  63. package/dist/core/transports.js.map +1 -1
  64. package/dist/lib/auth/keychain.d.ts +3 -0
  65. package/dist/lib/auth/keychain.d.ts.map +1 -1
  66. package/dist/lib/auth/keychain.js +18 -0
  67. package/dist/lib/auth/keychain.js.map +1 -1
  68. package/dist/lib/auth/oauth-flow.d.ts.map +1 -1
  69. package/dist/lib/auth/oauth-flow.js +55 -12
  70. package/dist/lib/auth/oauth-flow.js.map +1 -1
  71. package/dist/lib/auth/oauth-provider.d.ts.map +1 -1
  72. package/dist/lib/auth/oauth-provider.js +5 -23
  73. package/dist/lib/auth/oauth-provider.js.map +1 -1
  74. package/dist/lib/auth/oauth-token-manager.d.ts.map +1 -1
  75. package/dist/lib/auth/oauth-token-manager.js +0 -10
  76. package/dist/lib/auth/oauth-token-manager.js.map +1 -1
  77. package/dist/lib/auth/profiles.d.ts +5 -1
  78. package/dist/lib/auth/profiles.d.ts.map +1 -1
  79. package/dist/lib/auth/profiles.js +80 -13
  80. package/dist/lib/auth/profiles.js.map +1 -1
  81. package/dist/lib/bridge-manager.d.ts +3 -2
  82. package/dist/lib/bridge-manager.d.ts.map +1 -1
  83. package/dist/lib/bridge-manager.js +42 -24
  84. package/dist/lib/bridge-manager.js.map +1 -1
  85. package/dist/lib/config.d.ts +3 -3
  86. package/dist/lib/config.d.ts.map +1 -1
  87. package/dist/lib/config.js.map +1 -1
  88. package/dist/lib/errors.d.ts +6 -1
  89. package/dist/lib/errors.d.ts.map +1 -1
  90. package/dist/lib/errors.js +13 -1
  91. package/dist/lib/errors.js.map +1 -1
  92. package/dist/lib/logger.d.ts +7 -1
  93. package/dist/lib/logger.d.ts.map +1 -1
  94. package/dist/lib/logger.js +20 -1
  95. package/dist/lib/logger.js.map +1 -1
  96. package/dist/lib/schema-validator.d.ts +36 -0
  97. package/dist/lib/schema-validator.d.ts.map +1 -0
  98. package/dist/lib/schema-validator.js +265 -0
  99. package/dist/lib/schema-validator.js.map +1 -0
  100. package/dist/lib/session-client.d.ts +2 -2
  101. package/dist/lib/session-client.d.ts.map +1 -1
  102. package/dist/lib/session-client.js +3 -3
  103. package/dist/lib/session-client.js.map +1 -1
  104. package/dist/lib/sessions.d.ts +1 -1
  105. package/dist/lib/sessions.d.ts.map +1 -1
  106. package/dist/lib/sessions.js +22 -10
  107. package/dist/lib/sessions.js.map +1 -1
  108. package/dist/lib/types.d.ts +19 -25
  109. package/dist/lib/types.d.ts.map +1 -1
  110. package/dist/lib/types.js.map +1 -1
  111. package/dist/lib/utils.d.ts +2 -0
  112. package/dist/lib/utils.d.ts.map +1 -1
  113. package/dist/lib/utils.js +13 -1
  114. package/dist/lib/utils.js.map +1 -1
  115. package/docs/README.md +19 -0
  116. package/docs/TODOs.md +43 -0
  117. package/docs/claude-skill/SKILL.md +50 -30
  118. package/docs/images/mcpc-screenshot.png +0 -0
  119. package/package.json +15 -10
  120. package/PUBLISHING.md +0 -111
  121. package/TESTING.md +0 -212
  122. package/TODOs.md +0 -85
@@ -1,13 +1,14 @@
1
- import { isValidSessionName, validateProfileName, isProcessAlive, getServerHost } from '../../lib/index.js';
2
- import { formatOutput, formatSuccess, formatError } from '../output.js';
1
+ import { isValidSessionName, validateProfileName, isProcessAlive, getServerHost, redactHeaders } from '../../lib/index.js';
2
+ import { formatOutput, formatSuccess, formatError, formatSessionLine, formatServerDetails } from '../output.js';
3
+ import { withMcpClient, resolveTarget, resolveAuthProfile } from '../helpers.js';
3
4
  import { listAuthProfiles } from '../../lib/auth/profiles.js';
4
- import { sessionExists, deleteSession, saveSession, updateSession, consolidateSessions, } from '../../lib/sessions.js';
5
+ import { sessionExists, deleteSession, saveSession, updateSession, consolidateSessions, getSession, } from '../../lib/sessions.js';
5
6
  import { startBridge, stopBridge } from '../../lib/bridge-manager.js';
6
- import { storeKeychainSessionHeaders } from '../../lib/auth/keychain.js';
7
- import { resolveTarget, resolveAuthProfile } from '../helpers.js';
7
+ import { storeKeychainSessionHeaders, storeKeychainProxyBearerToken } from '../../lib/auth/keychain.js';
8
8
  import { ClientError } from '../../lib/index.js';
9
9
  import chalk from 'chalk';
10
10
  import { createLogger } from '../../lib/logger.js';
11
+ import { parseProxyArg } from '../parser.js';
11
12
  const logger = createLogger('sessions');
12
13
  export async function connectSession(name, target, options) {
13
14
  try {
@@ -18,14 +19,22 @@ export async function connectSession(name, target, options) {
18
19
  if (options.profile) {
19
20
  validateProfileName(options.profile);
20
21
  }
21
- const existingSession = await import('../../lib/sessions.js').then((m) => m.getSession(name));
22
+ let proxyConfig;
23
+ if (options.proxy) {
24
+ proxyConfig = parseProxyArg(options.proxy);
25
+ logger.debug(`Proxy config: ${proxyConfig.host}:${proxyConfig.port}`);
26
+ }
27
+ if (options.proxyBearerToken && !options.proxy) {
28
+ throw new ClientError('--proxy-bearer-token requires --proxy to be specified');
29
+ }
30
+ const existingSession = await getSession(name);
22
31
  if (existingSession) {
23
32
  const bridgeStatus = getBridgeStatus(existingSession);
24
33
  if (bridgeStatus === 'live') {
25
34
  if (options.outputMode === 'human') {
26
35
  console.log(formatSuccess(`Session ${name} is already active`));
27
36
  }
28
- await showServerInfo(name, { ...options, hideTarget: false });
37
+ await showServerDetails(name, { ...options, hideTarget: false });
29
38
  return;
30
39
  }
31
40
  if (options.outputMode === 'human') {
@@ -37,14 +46,14 @@ export async function connectSession(name, target, options) {
37
46
  catch {
38
47
  }
39
48
  }
40
- const transportConfig = await resolveTarget(target, options);
49
+ const serverConfig = await resolveTarget(target, options);
41
50
  let profileName;
42
- if (transportConfig.type === 'http' && transportConfig.url) {
43
- profileName = await resolveAuthProfile(transportConfig.url, target, options.profile, { sessionName: name });
51
+ if (serverConfig.url) {
52
+ profileName = await resolveAuthProfile(serverConfig.url, target, options.profile, { sessionName: name });
44
53
  }
45
54
  let headers;
46
- if (transportConfig.type === 'http' && Object.keys(transportConfig.headers || {}).length > 0) {
47
- headers = { ...transportConfig.headers };
55
+ if (Object.keys(serverConfig.headers || {}).length > 0) {
56
+ headers = { ...serverConfig.headers };
48
57
  if (profileName && headers.Authorization?.startsWith('Bearer ')) {
49
58
  logger.debug(`Skipping OAuth Authorization header storage for session ${name} (handled via profile)`);
50
59
  delete headers.Authorization;
@@ -57,42 +66,33 @@ export async function connectSession(name, target, options) {
57
66
  headers = undefined;
58
67
  }
59
68
  }
69
+ if (options.proxyBearerToken) {
70
+ logger.debug(`Storing proxy bearer token for session ${name} in keychain`);
71
+ await storeKeychainProxyBearerToken(name, options.proxyBearerToken);
72
+ }
60
73
  const isReconnect = !!existingSession;
74
+ const { headers: _originalHeaders, ...baseTransportConfig } = serverConfig;
75
+ const sessionTransportConfig = {
76
+ ...baseTransportConfig,
77
+ ...(headers && { headers: redactHeaders(headers) }),
78
+ };
79
+ const sessionUpdate = {
80
+ server: sessionTransportConfig,
81
+ ...(profileName && { profileName }),
82
+ ...(proxyConfig && { proxyConfig }),
83
+ };
61
84
  if (isReconnect) {
62
- const updateData = {
63
- target: transportConfig.url || transportConfig.command || 'unknown',
64
- transport: transportConfig.type,
65
- httpHeaderCount: Object.keys(headers || {}).length,
66
- };
67
- if (profileName) {
68
- updateData.profileName = profileName;
69
- }
70
- if (transportConfig.args && transportConfig.args.length > 0) {
71
- updateData.stdioArgs = transportConfig.args;
72
- }
73
- await updateSession(name, updateData);
85
+ await updateSession(name, sessionUpdate);
74
86
  logger.debug(`Session record updated for reconnect: ${name}`);
75
87
  }
76
88
  else {
77
- const sessionData = {
78
- target: transportConfig.url || transportConfig.command || 'unknown',
79
- transport: transportConfig.type,
80
- createdAt: new Date().toISOString(),
81
- httpHeaderCount: Object.keys(headers || {}).length,
82
- };
83
- if (profileName) {
84
- sessionData.profileName = profileName;
85
- }
86
- if (transportConfig.args && transportConfig.args.length > 0) {
87
- sessionData.stdioArgs = transportConfig.args;
88
- }
89
- await saveSession(name, sessionData);
89
+ await saveSession(name, { server: sessionTransportConfig, createdAt: new Date().toISOString(), ...sessionUpdate });
90
90
  logger.debug(`Initial session record created for: ${name}`);
91
91
  }
92
92
  try {
93
93
  const bridgeOptions = {
94
94
  sessionName: name,
95
- target: transportConfig,
95
+ serverConfig: serverConfig,
96
96
  verbose: options.verbose || false,
97
97
  };
98
98
  if (headers) {
@@ -101,6 +101,9 @@ export async function connectSession(name, target, options) {
101
101
  if (profileName) {
102
102
  bridgeOptions.profileName = profileName;
103
103
  }
104
+ if (proxyConfig) {
105
+ bridgeOptions.proxyConfig = proxyConfig;
106
+ }
104
107
  const { pid } = await startBridge(bridgeOptions);
105
108
  await updateSession(name, { pid });
106
109
  logger.debug(`Session ${name} updated with bridge PID: ${pid}`);
@@ -116,8 +119,10 @@ export async function connectSession(name, target, options) {
116
119
  }
117
120
  throw error;
118
121
  }
119
- console.log(formatSuccess(`Session ${name} ${isReconnect ? 'reconnected' : 'created'}`));
120
- await showServerInfo(name, {
122
+ if (options.outputMode === 'human') {
123
+ console.log(formatSuccess(`Session ${name} ${isReconnect ? 'reconnected' : 'created'}`));
124
+ }
125
+ await showServerDetails(name, {
121
126
  ...options,
122
127
  hideTarget: false,
123
128
  });
@@ -127,7 +132,7 @@ export async function connectSession(name, target, options) {
127
132
  console.error(formatError(error.message));
128
133
  }
129
134
  else {
130
- console.log(formatOutput({
135
+ console.error(formatOutput({
131
136
  sessionName: name,
132
137
  target,
133
138
  created: false,
@@ -142,7 +147,7 @@ function getBridgeStatus(session) {
142
147
  return 'expired';
143
148
  }
144
149
  if (!session.pid || !isProcessAlive(session.pid)) {
145
- return 'dead';
150
+ return 'crashed';
146
151
  }
147
152
  return 'live';
148
153
  }
@@ -150,8 +155,8 @@ function formatBridgeStatus(status) {
150
155
  switch (status) {
151
156
  case 'live':
152
157
  return { dot: chalk.green('●'), text: chalk.green('live') };
153
- case 'dead':
154
- return { dot: chalk.yellow('○'), text: chalk.yellow('dead') };
158
+ case 'crashed':
159
+ return { dot: chalk.yellow('○'), text: chalk.yellow('crashed') };
155
160
  case 'expired':
156
161
  return { dot: chalk.red('○'), text: chalk.red('expired') };
157
162
  }
@@ -180,11 +185,6 @@ function formatTimeAgo(isoDate) {
180
185
  return `${Math.floor(diffDays / 7)} weeks ago`;
181
186
  return `${Math.floor(diffDays / 30)} months ago`;
182
187
  }
183
- function truncateishStr(str, maxLen) {
184
- if (str.length <= maxLen + 3)
185
- return str;
186
- return str.substring(0, maxLen - 1) + '…';
187
- }
188
188
  export async function listSessionsAndAuthProfiles(options) {
189
189
  const consolidateResult = await consolidateSessions(false);
190
190
  const sessions = Object.values(consolidateResult.sessions);
@@ -208,30 +208,6 @@ export async function listSessionsAndAuthProfiles(options) {
208
208
  for (const session of sessions) {
209
209
  const status = getBridgeStatus(session);
210
210
  const { dot, text } = formatBridgeStatus(status);
211
- const nameStr = chalk.cyan(session.name);
212
- let target;
213
- if (session.transport === 'http') {
214
- target = getServerHost(session.target);
215
- }
216
- else {
217
- target = session.target;
218
- const args = session.stdioArgs;
219
- if (args && args.length > 0) {
220
- const argsStr = args.join(' ');
221
- target += ' ' + argsStr;
222
- }
223
- }
224
- const targetStr = truncateishStr(target, 80);
225
- let authStr;
226
- if (session.transport === 'stdio') {
227
- authStr = chalk.dim('(stdio)');
228
- }
229
- else if (session.profileName) {
230
- authStr = chalk.dim('(http, oauth: ') + chalk.magenta(session.profileName) + chalk.dim(')');
231
- }
232
- else {
233
- authStr = chalk.dim('(http)');
234
- }
235
211
  let statusStr = `${dot} ${text}`;
236
212
  if (session.lastSeenAt) {
237
213
  const lastSeenMs = Date.now() - new Date(session.lastSeenAt).getTime();
@@ -243,7 +219,7 @@ export async function listSessionsAndAuthProfiles(options) {
243
219
  }
244
220
  }
245
221
  }
246
- console.log(` ${nameStr} ${targetStr} ${authStr} ${statusStr}`);
222
+ console.log(` ${formatSessionLine(session)} ${statusStr}`);
247
223
  }
248
224
  }
249
225
  console.log('');
@@ -251,7 +227,7 @@ export async function listSessionsAndAuthProfiles(options) {
251
227
  console.log(chalk.dim('No OAuth profiles.'));
252
228
  }
253
229
  else {
254
- console.log(chalk.bold('OAuth profiles:'));
230
+ console.log(chalk.bold('Available OAuth profiles:'));
255
231
  for (const profile of profiles) {
256
232
  const hostStr = getServerHost(profile.serverUrl);
257
233
  const nameStr = chalk.magenta(profile.name);
@@ -292,7 +268,7 @@ export async function closeSession(name, options) {
292
268
  console.error(formatError(error.message));
293
269
  }
294
270
  else {
295
- console.log(formatOutput({
271
+ console.error(formatOutput({
296
272
  sessionName: name,
297
273
  closed: false,
298
274
  error: error.message,
@@ -301,128 +277,93 @@ export async function closeSession(name, options) {
301
277
  throw error;
302
278
  }
303
279
  }
304
- export async function showServerInfo(target, options) {
305
- const { withMcpClient } = await import('../helpers.js');
306
- await withMcpClient(target, options, async (client) => {
307
- const { serverVersion, capabilities, instructions, protocolVersion } = await client.getServerInfo();
280
+ export async function showServerDetails(target, options) {
281
+ await withMcpClient(target, options, async (client, context) => {
282
+ const serverDetails = await client.getServerDetails();
283
+ const { serverInfo, capabilities, instructions, protocolVersion } = serverDetails;
308
284
  if (options.outputMode === 'human') {
309
- console.log('');
310
- if (serverVersion) {
311
- const versionInfo = protocolVersion ? ` (MCP version: ${protocolVersion})` : '';
312
- console.log(`Server: ${serverVersion.name} v${serverVersion.version}${versionInfo}`);
313
- console.log('');
314
- }
315
- console.log('Capabilities:');
316
- const capabilityList = [];
317
- if (capabilities?.tools) {
318
- capabilityList.push(` • tools ${capabilities.tools.listChanged ? '(dynamic)' : '(static)'}`);
319
- }
320
- if (capabilities?.resources) {
321
- const features = [];
322
- if (capabilities.resources.subscribe)
323
- features.push('subscribe');
324
- if (capabilities.resources.listChanged)
325
- features.push('dynamic list');
326
- const featureStr = features.length > 0 ? ` (supports ${features.join(', ')})` : '';
327
- capabilityList.push(` • resources${featureStr}`);
328
- }
329
- if (capabilities?.prompts) {
330
- const featureStr = capabilities.prompts.listChanged ? ' (dynamic list)' : '';
331
- capabilityList.push(` • prompts${featureStr}`);
332
- }
333
- if (capabilities?.logging) {
334
- capabilityList.push(' • logging');
335
- }
336
- if (capabilities?.completions) {
337
- capabilityList.push(' • completions');
338
- }
339
- if (capabilityList.length > 0) {
340
- console.log(capabilityList.join('\n'));
341
- }
342
- else {
343
- console.log(' (none)');
344
- }
345
- console.log('');
346
- console.log('Available commands:');
347
- const commands = [];
348
- if (capabilities?.tools) {
349
- commands.push(` mcpc ${target} tools-list`);
350
- commands.push(` mcpc ${target} tools-schema <name>`);
351
- commands.push(` mcpc ${target} tools-call <name> [--args key=val ...] [--args-file <file>]`);
352
- }
353
- if (capabilities?.resources) {
354
- commands.push(` mcpc ${target} resources-list`);
355
- commands.push(` mcpc ${target} resources-read <uri>`);
356
- }
357
- if (capabilities?.prompts) {
358
- commands.push(` mcpc ${target} prompts-list`);
359
- commands.push(` mcpc ${target} prompts-get <name>`);
360
- }
361
- if (capabilities?.logging) {
362
- commands.push(` mcpc ${target} logging-set-level <lvl> Set server log level`);
363
- }
364
- commands.push(` mcpc ${target} shell`);
365
- console.log(commands.join('\n'));
366
- console.log('');
367
- if (instructions) {
368
- console.log('Server instructions:');
369
- console.log(instructions);
370
- console.log('');
371
- }
285
+ console.log(formatServerDetails(serverDetails, target));
372
286
  }
373
287
  else {
374
- const jsonCapabilities = {};
375
- if (capabilities?.tools) {
376
- jsonCapabilities.tools = {
377
- listChanged: capabilities.tools.listChanged || false,
378
- };
379
- }
380
- if (capabilities?.resources) {
381
- jsonCapabilities.resources = {
382
- subscribe: capabilities.resources.subscribe || false,
383
- listChanged: capabilities.resources.listChanged || false,
384
- };
385
- }
386
- if (capabilities?.prompts) {
387
- jsonCapabilities.prompts = {
388
- listChanged: capabilities.prompts.listChanged || false,
389
- };
390
- }
391
- if (capabilities?.logging) {
392
- jsonCapabilities.logging = {};
393
- }
394
- if (capabilities?.completions) {
395
- jsonCapabilities.completions = {};
396
- }
397
- const availableCommands = [];
398
- if (capabilities?.tools) {
399
- availableCommands.push('tools-list', 'tools-schema', 'tools-call');
400
- }
401
- if (capabilities?.resources) {
402
- availableCommands.push('resources-list', 'resources-read');
403
- if (capabilities.resources.subscribe) {
404
- availableCommands.push('resources-subscribe', 'resources-unsubscribe');
405
- }
406
- }
407
- if (capabilities?.prompts) {
408
- availableCommands.push('prompts-list', 'prompts-get');
409
- }
410
- if (capabilities?.logging) {
411
- availableCommands.push('logging-set-level');
412
- }
413
- availableCommands.push('shell');
288
+ const server = {
289
+ ...context.serverConfig,
290
+ ...(context.serverConfig?.headers && { headers: redactHeaders(context.serverConfig.headers) }),
291
+ };
414
292
  console.log(formatOutput({
415
- target,
416
- server: serverVersion,
417
- instructions: instructions || null,
418
- capabilities: jsonCapabilities,
419
- availableCommands,
293
+ _meta: {
294
+ sessionName: context.sessionName,
295
+ profileName: context.profileName,
296
+ server,
297
+ },
298
+ protocolVersion,
299
+ capabilities,
300
+ serverInfo,
301
+ instructions,
420
302
  }, 'json'));
421
303
  }
422
304
  });
423
305
  }
306
+ export async function restartSession(name, options) {
307
+ try {
308
+ const session = await getSession(name);
309
+ if (!session) {
310
+ throw new ClientError(`Session not found: ${name}`);
311
+ }
312
+ if (options.outputMode === 'human') {
313
+ console.log(chalk.yellow(`Restarting session ${name}...`));
314
+ }
315
+ try {
316
+ await stopBridge(name);
317
+ }
318
+ catch {
319
+ }
320
+ const serverConfig = session.server;
321
+ if (!serverConfig) {
322
+ throw new ClientError(`Session ${name} has no server configuration`);
323
+ }
324
+ const { readKeychainSessionHeaders } = await import('../../lib/auth/keychain.js');
325
+ const headers = await readKeychainSessionHeaders(name);
326
+ const bridgeOptions = {
327
+ sessionName: name,
328
+ serverConfig: { ...serverConfig, ...(headers && { headers }) },
329
+ verbose: options.verbose || false,
330
+ };
331
+ if (headers) {
332
+ bridgeOptions.headers = headers;
333
+ }
334
+ if (session.profileName) {
335
+ bridgeOptions.profileName = session.profileName;
336
+ }
337
+ if (session.proxy) {
338
+ bridgeOptions.proxyConfig = session.proxy;
339
+ }
340
+ const { pid } = await startBridge(bridgeOptions);
341
+ await updateSession(name, { pid });
342
+ logger.debug(`Session ${name} restarted with bridge PID: ${pid}`);
343
+ if (options.outputMode === 'human') {
344
+ console.log(formatSuccess(`Session ${name} restarted`));
345
+ }
346
+ await showServerDetails(name, {
347
+ ...options,
348
+ hideTarget: false,
349
+ });
350
+ }
351
+ catch (error) {
352
+ if (options.outputMode === 'human') {
353
+ console.error(formatError(error.message));
354
+ }
355
+ else {
356
+ console.error(formatOutput({
357
+ sessionName: name,
358
+ restarted: false,
359
+ error: error.message,
360
+ }, 'json'));
361
+ }
362
+ throw error;
363
+ }
364
+ }
424
365
  export async function showHelp(target, options) {
425
- await showServerInfo(target, options);
366
+ await showServerDetails(target, options);
426
367
  }
427
368
  export async function openShell(target) {
428
369
  const { startShell } = await import('../shell.js');
@@ -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;AASzD,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,CAgBlG;AAKD,wBAAsB,QAAQ,CAC5B,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,cAAc,GAAG;IACxB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,GACA,OAAO,CAAC,IAAI,CAAC,CAwBf"}
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,9 +1,10 @@
1
- import { formatOutput, formatToolDetail, formatSuccess } from '../output.js';
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, loadArgsFromFile } from '../parser.js';
4
+ import { parseCommandArgs, hasStdinData, readStdinArgs } from '../parser.js';
5
+ import { loadSchemaFromFile, validateToolSchema, formatValidationError, } from '../../lib/schema-validator.js';
5
6
  export async function listTools(target, options) {
6
- await withMcpClient(target, options, async (client) => {
7
+ await withMcpClient(target, options, async (client, _context) => {
7
8
  const allTools = [];
8
9
  let cursor = undefined;
9
10
  do {
@@ -15,12 +16,28 @@ export async function listTools(target, options) {
15
16
  });
16
17
  }
17
18
  export async function getTool(target, name, options) {
18
- await withMcpClient(target, options, async (client) => {
19
+ let expectedSchema;
20
+ if (options.schema) {
21
+ expectedSchema = (await loadSchemaFromFile(options.schema));
22
+ }
23
+ await withMcpClient(target, options, async (client, _context) => {
19
24
  const result = await client.listTools();
20
25
  const tool = result.tools.find((t) => t.name === name);
21
26
  if (!tool) {
22
27
  throw new ClientError(`Tool not found: ${name}`);
23
28
  }
29
+ if (expectedSchema) {
30
+ const schemaMode = options.schemaMode || 'compatible';
31
+ const validation = validateToolSchema(tool, expectedSchema, schemaMode);
32
+ if (!validation.valid) {
33
+ throw new ClientError(formatValidationError(validation, `tool "${name}"`));
34
+ }
35
+ if (validation.warnings.length > 0 && options.outputMode === 'human') {
36
+ for (const warning of validation.warnings) {
37
+ console.log(formatWarning(`Schema warning: ${warning}`));
38
+ }
39
+ }
40
+ }
24
41
  if (options.outputMode === 'human') {
25
42
  console.log(formatToolDetail(tool));
26
43
  }
@@ -31,16 +48,37 @@ export async function getTool(target, name, options) {
31
48
  }
32
49
  export async function callTool(target, name, options) {
33
50
  let parsedArgs;
34
- if (options.argsFile && options.args && options.args.length > 0) {
35
- throw new ClientError('Cannot use both --args and --args-file');
51
+ if (options.args && options.args.length > 0) {
52
+ parsedArgs = parseCommandArgs(options.args);
36
53
  }
37
- if (options.argsFile) {
38
- parsedArgs = loadArgsFromFile(options.argsFile);
54
+ else if (hasStdinData()) {
55
+ parsedArgs = await readStdinArgs();
39
56
  }
40
57
  else {
41
- parsedArgs = parseCommandArgs(options.args);
58
+ parsedArgs = {};
59
+ }
60
+ let expectedSchema;
61
+ if (options.schema) {
62
+ expectedSchema = (await loadSchemaFromFile(options.schema));
42
63
  }
43
- await withMcpClient(target, options, async (client) => {
64
+ await withMcpClient(target, options, async (client, _context) => {
65
+ const schemaMode = options.schemaMode || 'compatible';
66
+ if (expectedSchema && schemaMode !== 'ignore') {
67
+ const result = await client.listTools();
68
+ const actualTool = result.tools.find((t) => t.name === name);
69
+ if (!actualTool) {
70
+ throw new ClientError(`Tool not found: ${name}`);
71
+ }
72
+ const validation = validateToolSchema(actualTool, expectedSchema, schemaMode, parsedArgs);
73
+ if (!validation.valid) {
74
+ throw new ClientError(formatValidationError(validation, `tool "${name}"`));
75
+ }
76
+ if (validation.warnings.length > 0 && options.outputMode === 'human') {
77
+ for (const warning of validation.warnings) {
78
+ console.log(formatWarning(`Schema warning: ${warning}`));
79
+ }
80
+ }
81
+ }
44
82
  const result = await client.callTool(name, parsedArgs);
45
83
  if (options.outputMode === 'human') {
46
84
  console.log(formatSuccess(`Tool ${name} executed successfully`));
@@ -1 +1 @@
1
- {"version":3,"file":"tools.js","sourceRoot":"","sources":["../../../src/cli/commands/tools.ts"],"names":[],"mappings":"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"}
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();