@apify/mcpc 0.1.2 → 0.1.4
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 +35 -2
- package/.idea/codeStyles/Project.xml +4 -0
- package/.idea/workspace.xml +290 -274
- package/CONTRIBUTING.md +210 -0
- package/README.md +225 -344
- package/TODOs.md +29 -76
- package/dist/bridge/index.js +153 -86
- package/dist/bridge/index.js.map +1 -1
- package/dist/cli/commands/auth.d.ts.map +1 -1
- package/dist/cli/commands/auth.js +9 -4
- package/dist/cli/commands/auth.js.map +1 -1
- package/dist/cli/commands/clean.d.ts.map +1 -1
- package/dist/cli/commands/clean.js +42 -73
- package/dist/cli/commands/clean.js.map +1 -1
- package/dist/cli/commands/prompts.d.ts.map +1 -1
- package/dist/cli/commands/prompts.js +24 -1
- package/dist/cli/commands/prompts.js.map +1 -1
- package/dist/cli/commands/sessions.d.ts +5 -1
- package/dist/cli/commands/sessions.d.ts.map +1 -1
- package/dist/cli/commands/sessions.js +162 -132
- package/dist/cli/commands/sessions.js.map +1 -1
- package/dist/cli/commands/tools.d.ts.map +1 -1
- package/dist/cli/commands/tools.js +39 -1
- package/dist/cli/commands/tools.js.map +1 -1
- package/dist/cli/helpers.d.ts +5 -2
- package/dist/cli/helpers.d.ts.map +1 -1
- package/dist/cli/helpers.js +114 -74
- package/dist/cli/helpers.js.map +1 -1
- package/dist/cli/index.js +50 -14
- package/dist/cli/index.js.map +1 -1
- package/dist/cli/output.d.ts +19 -3
- package/dist/cli/output.d.ts.map +1 -1
- package/dist/cli/output.js +395 -85
- package/dist/cli/output.js.map +1 -1
- package/dist/cli/parser.d.ts +4 -0
- package/dist/cli/parser.d.ts.map +1 -1
- package/dist/cli/parser.js +88 -1
- package/dist/cli/parser.js.map +1 -1
- package/dist/cli/shell-parser.d.ts.map +1 -1
- package/dist/cli/shell-parser.js.map +1 -1
- package/dist/cli/shell.js +13 -13
- package/dist/cli/shell.js.map +1 -1
- package/dist/core/factory.d.ts +4 -4
- package/dist/core/factory.d.ts.map +1 -1
- package/dist/core/factory.js +4 -34
- package/dist/core/factory.js.map +1 -1
- package/dist/core/mcp-client.d.ts +2 -2
- package/dist/core/mcp-client.d.ts.map +1 -1
- package/dist/core/mcp-client.js +18 -22
- package/dist/core/mcp-client.js.map +1 -1
- package/dist/core/transports.d.ts +6 -2
- package/dist/core/transports.d.ts.map +1 -1
- package/dist/core/transports.js +58 -37
- package/dist/core/transports.js.map +1 -1
- package/dist/lib/auth/keychain.d.ts.map +1 -1
- package/dist/lib/auth/keychain.js +5 -2
- 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 +14 -2
- package/dist/lib/auth/oauth-flow.js.map +1 -1
- package/dist/lib/auth/oauth-provider.d.ts +19 -8
- package/dist/lib/auth/oauth-provider.d.ts.map +1 -1
- package/dist/lib/auth/oauth-provider.js +79 -29
- package/dist/lib/auth/oauth-provider.js.map +1 -1
- package/dist/lib/auth/oauth-token-manager.d.ts +8 -0
- package/dist/lib/auth/oauth-token-manager.d.ts.map +1 -1
- package/dist/lib/auth/oauth-token-manager.js +33 -0
- package/dist/lib/auth/oauth-token-manager.js.map +1 -1
- package/dist/lib/auth/{auth-profiles.d.ts → profiles.d.ts} +7 -2
- package/dist/lib/auth/profiles.d.ts.map +1 -0
- package/dist/lib/auth/profiles.js +188 -0
- package/dist/lib/auth/profiles.js.map +1 -0
- package/dist/lib/auth/token-refresh.js +1 -1
- package/dist/lib/auth/token-refresh.js.map +1 -1
- package/dist/lib/bridge-client.js.map +1 -1
- package/dist/lib/bridge-manager.d.ts +2 -3
- package/dist/lib/bridge-manager.d.ts.map +1 -1
- package/dist/lib/bridge-manager.js +48 -63
- package/dist/lib/bridge-manager.js.map +1 -1
- package/dist/lib/cleanup.d.ts +5 -0
- package/dist/lib/cleanup.d.ts.map +1 -0
- package/dist/lib/cleanup.js +48 -0
- package/dist/lib/cleanup.js.map +1 -0
- package/dist/lib/config.d.ts +3 -3
- package/dist/lib/config.d.ts.map +1 -1
- package/dist/lib/config.js.map +1 -1
- package/dist/lib/errors.d.ts +1 -1
- package/dist/lib/errors.d.ts.map +1 -1
- package/dist/lib/errors.js +5 -1
- package/dist/lib/errors.js.map +1 -1
- package/dist/lib/index.d.ts +1 -0
- package/dist/lib/index.d.ts.map +1 -1
- package/dist/lib/index.js +1 -0
- package/dist/lib/index.js.map +1 -1
- package/dist/lib/logger.d.ts +5 -1
- package/dist/lib/logger.d.ts.map +1 -1
- package/dist/lib/logger.js +10 -1
- package/dist/lib/logger.js.map +1 -1
- package/dist/lib/schema-validator.d.ts +36 -0
- package/dist/lib/schema-validator.d.ts.map +1 -0
- package/dist/lib/schema-validator.js +220 -0
- package/dist/lib/schema-validator.js.map +1 -0
- package/dist/lib/session-client.d.ts +2 -2
- package/dist/lib/session-client.d.ts.map +1 -1
- package/dist/lib/session-client.js +9 -9
- package/dist/lib/session-client.js.map +1 -1
- package/dist/lib/sessions.d.ts +6 -1
- package/dist/lib/sessions.d.ts.map +1 -1
- package/dist/lib/sessions.js +72 -14
- package/dist/lib/sessions.js.map +1 -1
- package/dist/lib/types.d.ts +17 -25
- package/dist/lib/types.d.ts.map +1 -1
- package/dist/lib/types.js.map +1 -1
- package/dist/lib/utils.d.ts +4 -1
- package/dist/lib/utils.d.ts.map +1 -1
- package/dist/lib/utils.js +24 -3
- package/dist/lib/utils.js.map +1 -1
- package/{claude-skill → docs/claude-skill}/SKILL.md +2 -2
- package/package.json +17 -8
- package/TESTING.md +0 -212
- package/dist/lib/auth/auth-profiles.d.ts.map +0 -1
- package/dist/lib/auth/auth-profiles.js +0 -105
- package/dist/lib/auth/auth-profiles.js.map +0 -1
- /package/{claude-skill → docs/claude-skill}/README.md +0 -0
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { formatSuccess, formatError, formatOutput, formatInfo } from '../output.js';
|
|
2
|
-
import {
|
|
1
|
+
import { formatSuccess, formatError, formatOutput, formatInfo, formatWarning } from '../output.js';
|
|
2
|
+
import { deleteAuthProfiles } from '../../lib/auth/profiles.js';
|
|
3
3
|
import { performOAuthFlow } from '../../lib/auth/oauth-flow.js';
|
|
4
4
|
import { normalizeServerUrl, validateProfileName } from '../../lib/utils.js';
|
|
5
5
|
import chalk from 'chalk';
|
|
@@ -45,8 +45,8 @@ export async function logout(serverUrl, options) {
|
|
|
45
45
|
const normalizedUrl = normalizeServerUrl(serverUrl);
|
|
46
46
|
const profileName = options.profile || DEFAULT_AUTH_PROFILE;
|
|
47
47
|
validateProfileName(profileName);
|
|
48
|
-
const
|
|
49
|
-
if (
|
|
48
|
+
const result = await deleteAuthProfiles(normalizedUrl, profileName);
|
|
49
|
+
if (result.count === 0) {
|
|
50
50
|
if (options.outputMode === 'human') {
|
|
51
51
|
console.error(formatError(`Profile ${chalk.cyan(profileName)} for ${normalizedUrl} not found`));
|
|
52
52
|
}
|
|
@@ -58,12 +58,17 @@ export async function logout(serverUrl, options) {
|
|
|
58
58
|
}
|
|
59
59
|
if (options.outputMode === 'human') {
|
|
60
60
|
console.log(formatSuccess(`Profile ${chalk.cyan(profileName)} for ${normalizedUrl} deleted`));
|
|
61
|
+
if (result.affectedSessions.length > 0) {
|
|
62
|
+
console.log(formatWarning(`Warning: ${result.affectedSessions.length} session(s) were using this profile: ${result.affectedSessions.join(', ')}`));
|
|
63
|
+
console.log(formatWarning('These sessions may fail to authenticate. Recreate them or login again.'));
|
|
64
|
+
}
|
|
61
65
|
}
|
|
62
66
|
else {
|
|
63
67
|
console.log(formatOutput({
|
|
64
68
|
profile: profileName,
|
|
65
69
|
serverUrl: normalizedUrl,
|
|
66
70
|
deleted: true,
|
|
71
|
+
affectedSessions: result.affectedSessions,
|
|
67
72
|
}, 'json'));
|
|
68
73
|
}
|
|
69
74
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../../src/cli/commands/auth.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../../src/cli/commands/auth.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"clean.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/clean.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAUrD,UAAU,YAAY;IACpB,UAAU,EAAE,UAAU,CAAC;IACvB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,GAAG,CAAC,EAAE,OAAO,CAAC;CACf;
|
|
1
|
+
{"version":3,"file":"clean.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/clean.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAUrD,UAAU,YAAY;IACpB,UAAU,EAAE,UAAU,CAAC;IACvB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,GAAG,CAAC,EAAE,OAAO,CAAC;CACf;AA4JD,wBAAsB,KAAK,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAwGhE"}
|
|
@@ -1,51 +1,20 @@
|
|
|
1
1
|
import { readdir, unlink, rm } from 'fs/promises';
|
|
2
2
|
import { join } from 'path';
|
|
3
|
-
import { getMcpcHome, getBridgesDir, getLogsDir,
|
|
4
|
-
import { formatOutput, formatSuccess } from '../output.js';
|
|
5
|
-
import { loadSessions, deleteSession } from '../../lib/sessions.js';
|
|
3
|
+
import { getMcpcHome, getBridgesDir, getLogsDir, fileExists, cleanupOrphanedLogFiles } from '../../lib/index.js';
|
|
4
|
+
import { formatOutput, formatSuccess, formatWarning } from '../output.js';
|
|
5
|
+
import { loadSessions, deleteSession, consolidateSessions } from '../../lib/sessions.js';
|
|
6
6
|
import { stopBridge } from '../../lib/bridge-manager.js';
|
|
7
|
-
import { removeKeychainSessionHeaders } from '../../lib/auth/keychain.js';
|
|
8
7
|
import { createLogger } from '../../lib/logger.js';
|
|
8
|
+
import { deleteAuthProfiles } from '../../lib/auth/profiles.js';
|
|
9
9
|
const logger = createLogger('clean');
|
|
10
10
|
async function cleanStale() {
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
deadBridges++;
|
|
19
|
-
if (session.socketPath && (await fileExists(session.socketPath))) {
|
|
20
|
-
try {
|
|
21
|
-
await unlink(session.socketPath);
|
|
22
|
-
staleSockets++;
|
|
23
|
-
logger.debug(`Removed stale socket: ${session.socketPath}`);
|
|
24
|
-
}
|
|
25
|
-
catch {
|
|
26
|
-
}
|
|
27
|
-
}
|
|
28
|
-
}
|
|
29
|
-
}
|
|
30
|
-
const bridgesDir = getBridgesDir();
|
|
31
|
-
if (await fileExists(bridgesDir)) {
|
|
32
|
-
const files = await readdir(bridgesDir);
|
|
33
|
-
for (const file of files) {
|
|
34
|
-
if (file.endsWith('.sock')) {
|
|
35
|
-
const sessionName = file.replace('.sock', '');
|
|
36
|
-
if (!sessions[sessionName]) {
|
|
37
|
-
try {
|
|
38
|
-
await unlink(join(bridgesDir, file));
|
|
39
|
-
staleSockets++;
|
|
40
|
-
logger.debug(`Removed orphaned socket: ${file}`);
|
|
41
|
-
}
|
|
42
|
-
catch {
|
|
43
|
-
}
|
|
44
|
-
}
|
|
45
|
-
}
|
|
46
|
-
}
|
|
47
|
-
}
|
|
48
|
-
return { staleSockets, deadBridges };
|
|
11
|
+
const consolidateResult = await consolidateSessions(true);
|
|
12
|
+
const orphanedBridgeLogs = await cleanupOrphanedLogFiles(consolidateResult.sessions);
|
|
13
|
+
return {
|
|
14
|
+
deadBridges: consolidateResult.deadBridges,
|
|
15
|
+
expiredSessions: consolidateResult.expiredSessions,
|
|
16
|
+
orphanedBridgeLogs,
|
|
17
|
+
};
|
|
49
18
|
}
|
|
50
19
|
async function cleanSessions() {
|
|
51
20
|
const sessionsStorage = await loadSessions();
|
|
@@ -59,11 +28,6 @@ async function cleanSessions() {
|
|
|
59
28
|
catch {
|
|
60
29
|
}
|
|
61
30
|
await deleteSession(name);
|
|
62
|
-
try {
|
|
63
|
-
await removeKeychainSessionHeaders(name);
|
|
64
|
-
}
|
|
65
|
-
catch {
|
|
66
|
-
}
|
|
67
31
|
count++;
|
|
68
32
|
logger.debug(`Cleaned session: ${name}`);
|
|
69
33
|
}
|
|
@@ -73,21 +37,6 @@ async function cleanSessions() {
|
|
|
73
37
|
}
|
|
74
38
|
return count;
|
|
75
39
|
}
|
|
76
|
-
async function cleanProfiles() {
|
|
77
|
-
const mcpcHome = getMcpcHome();
|
|
78
|
-
const profilesFile = join(mcpcHome, 'auth-profiles.json');
|
|
79
|
-
if (!(await fileExists(profilesFile))) {
|
|
80
|
-
return 0;
|
|
81
|
-
}
|
|
82
|
-
try {
|
|
83
|
-
await unlink(profilesFile);
|
|
84
|
-
logger.debug('Removed auth-profiles.json');
|
|
85
|
-
return 1;
|
|
86
|
-
}
|
|
87
|
-
catch {
|
|
88
|
-
return 0;
|
|
89
|
-
}
|
|
90
|
-
}
|
|
91
40
|
async function cleanLogs() {
|
|
92
41
|
const logsDir = getLogsDir();
|
|
93
42
|
if (!(await fileExists(logsDir))) {
|
|
@@ -110,18 +59,22 @@ async function cleanLogs() {
|
|
|
110
59
|
}
|
|
111
60
|
async function cleanAll() {
|
|
112
61
|
const result = {
|
|
113
|
-
staleSockets: 0,
|
|
114
62
|
deadBridges: 0,
|
|
63
|
+
expiredSessions: 0,
|
|
64
|
+
orphanedBridgeLogs: 0,
|
|
115
65
|
sessions: 0,
|
|
116
66
|
profiles: 0,
|
|
117
67
|
logs: 0,
|
|
118
68
|
};
|
|
119
69
|
result.sessions = await cleanSessions();
|
|
120
|
-
|
|
70
|
+
const profilesResult = await deleteAuthProfiles();
|
|
71
|
+
result.profiles = profilesResult.count;
|
|
72
|
+
result.affectedSessions = profilesResult.affectedSessions;
|
|
121
73
|
result.logs = await cleanLogs();
|
|
122
74
|
const staleResult = await cleanStale();
|
|
123
|
-
result.staleSockets = staleResult.staleSockets;
|
|
124
75
|
result.deadBridges = staleResult.deadBridges;
|
|
76
|
+
result.expiredSessions = staleResult.expiredSessions;
|
|
77
|
+
result.orphanedBridgeLogs = staleResult.orphanedBridgeLogs;
|
|
125
78
|
const mcpcHome = getMcpcHome();
|
|
126
79
|
const bridgesDir = getBridgesDir();
|
|
127
80
|
const logsDir = getLogsDir();
|
|
@@ -149,8 +102,9 @@ async function cleanAll() {
|
|
|
149
102
|
}
|
|
150
103
|
export async function clean(options) {
|
|
151
104
|
const result = {
|
|
152
|
-
staleSockets: 0,
|
|
153
105
|
deadBridges: 0,
|
|
106
|
+
expiredSessions: 0,
|
|
107
|
+
orphanedBridgeLogs: 0,
|
|
154
108
|
sessions: 0,
|
|
155
109
|
profiles: 0,
|
|
156
110
|
logs: 0,
|
|
@@ -165,8 +119,6 @@ export async function clean(options) {
|
|
|
165
119
|
parts.push(`${allResult.profiles} profile(s)`);
|
|
166
120
|
if (allResult.logs > 0)
|
|
167
121
|
parts.push(`${allResult.logs} log file(s)`);
|
|
168
|
-
if (allResult.staleSockets > 0)
|
|
169
|
-
parts.push(`${allResult.staleSockets} socket(s)`);
|
|
170
122
|
if (parts.length > 0) {
|
|
171
123
|
console.log(formatSuccess(`Cleaned ${parts.join(', ')}`));
|
|
172
124
|
}
|
|
@@ -182,14 +134,17 @@ export async function clean(options) {
|
|
|
182
134
|
const cleaningSpecific = options.sessions || options.profiles || options.logs;
|
|
183
135
|
if (!cleaningSpecific) {
|
|
184
136
|
const staleResult = await cleanStale();
|
|
185
|
-
result.staleSockets = staleResult.staleSockets;
|
|
186
137
|
result.deadBridges = staleResult.deadBridges;
|
|
138
|
+
result.expiredSessions = staleResult.expiredSessions;
|
|
139
|
+
result.orphanedBridgeLogs = staleResult.orphanedBridgeLogs;
|
|
187
140
|
}
|
|
188
141
|
if (options.sessions) {
|
|
189
142
|
result.sessions = await cleanSessions();
|
|
190
143
|
}
|
|
191
144
|
if (options.profiles) {
|
|
192
|
-
|
|
145
|
+
const profilesResult = await deleteAuthProfiles();
|
|
146
|
+
result.profiles = profilesResult.count;
|
|
147
|
+
result.affectedSessions = profilesResult.affectedSessions;
|
|
193
148
|
}
|
|
194
149
|
if (options.logs) {
|
|
195
150
|
result.logs = await cleanLogs();
|
|
@@ -197,8 +152,18 @@ export async function clean(options) {
|
|
|
197
152
|
if (options.outputMode === 'human') {
|
|
198
153
|
const messages = [];
|
|
199
154
|
if (!cleaningSpecific) {
|
|
200
|
-
|
|
201
|
-
|
|
155
|
+
const hasCleanups = result.deadBridges > 0 ||
|
|
156
|
+
result.expiredSessions > 0 ||
|
|
157
|
+
result.orphanedBridgeLogs > 0;
|
|
158
|
+
if (hasCleanups) {
|
|
159
|
+
const parts = [];
|
|
160
|
+
if (result.deadBridges > 0)
|
|
161
|
+
parts.push(`${result.deadBridges} dead bridge(s)`);
|
|
162
|
+
if (result.expiredSessions > 0)
|
|
163
|
+
parts.push(`${result.expiredSessions} expired session(s)`);
|
|
164
|
+
if (result.orphanedBridgeLogs > 0)
|
|
165
|
+
parts.push(`${result.orphanedBridgeLogs} orphaned log(s)`);
|
|
166
|
+
messages.push(`Cleaned ${parts.join(', ')}`);
|
|
202
167
|
}
|
|
203
168
|
else {
|
|
204
169
|
messages.push('No stale resources found');
|
|
@@ -208,7 +173,7 @@ export async function clean(options) {
|
|
|
208
173
|
messages.push(`Removed ${result.sessions} session(s)`);
|
|
209
174
|
}
|
|
210
175
|
if (options.profiles) {
|
|
211
|
-
messages.push(result.profiles > 0 ?
|
|
176
|
+
messages.push(result.profiles > 0 ? `Removed ${result.profiles} authentication profile(s)` : 'No profiles to remove');
|
|
212
177
|
}
|
|
213
178
|
if (options.logs) {
|
|
214
179
|
messages.push(`Removed ${result.logs} log file(s)`);
|
|
@@ -216,6 +181,10 @@ export async function clean(options) {
|
|
|
216
181
|
for (const msg of messages) {
|
|
217
182
|
console.log(formatSuccess(msg));
|
|
218
183
|
}
|
|
184
|
+
if (result.affectedSessions && result.affectedSessions.length > 0) {
|
|
185
|
+
console.log(formatWarning(`Warning: ${result.affectedSessions.length} session(s) were using deleted profiles: ${result.affectedSessions.join(', ')}`));
|
|
186
|
+
console.log(formatWarning('These sessions may fail to authenticate. Recreate them or login again.'));
|
|
187
|
+
}
|
|
219
188
|
}
|
|
220
189
|
else {
|
|
221
190
|
console.log(formatOutput(result, 'json'));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"clean.js","sourceRoot":"","sources":["../../../src/cli/commands/clean.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAE5B,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,UAAU,EAAE,
|
|
1
|
+
{"version":3,"file":"clean.js","sourceRoot":"","sources":["../../../src/cli/commands/clean.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prompts.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/prompts.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"prompts.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/prompts.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAiBzD,wBAAsB,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAcxF;AAKD,wBAAsB,SAAS,CAC7B,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,CA6Cf"}
|
|
@@ -1,6 +1,8 @@
|
|
|
1
|
-
import { formatOutput } from '../output.js';
|
|
1
|
+
import { formatOutput, formatWarning } from '../output.js';
|
|
2
2
|
import { withMcpClient } from '../helpers.js';
|
|
3
3
|
import { parseCommandArgs } from '../parser.js';
|
|
4
|
+
import { ClientError } from '../../lib/errors.js';
|
|
5
|
+
import { loadSchemaFromFile, validatePromptSchema, formatValidationError, } from '../../lib/schema-validator.js';
|
|
4
6
|
export async function listPrompts(target, options) {
|
|
5
7
|
await withMcpClient(target, options, async (client) => {
|
|
6
8
|
const allPrompts = [];
|
|
@@ -19,7 +21,28 @@ export async function getPrompt(target, name, options) {
|
|
|
19
21
|
for (const [key, value] of Object.entries(parsedArgs)) {
|
|
20
22
|
promptArgs[key] = typeof value === 'string' ? value : JSON.stringify(value);
|
|
21
23
|
}
|
|
24
|
+
let expectedSchema;
|
|
25
|
+
if (options.schema) {
|
|
26
|
+
expectedSchema = (await loadSchemaFromFile(options.schema));
|
|
27
|
+
}
|
|
22
28
|
await withMcpClient(target, options, async (client) => {
|
|
29
|
+
const schemaMode = options.schemaMode || 'compatible';
|
|
30
|
+
if (expectedSchema && schemaMode !== 'ignore') {
|
|
31
|
+
const result = await client.listPrompts();
|
|
32
|
+
const actualSchema = result.prompts.find((p) => p.name === name);
|
|
33
|
+
if (!actualSchema) {
|
|
34
|
+
throw new ClientError(`Prompt not found: ${name}`);
|
|
35
|
+
}
|
|
36
|
+
const validation = validatePromptSchema(actualSchema, expectedSchema, schemaMode, promptArgs);
|
|
37
|
+
if (!validation.valid) {
|
|
38
|
+
throw new ClientError(formatValidationError(validation, `prompt "${name}"`));
|
|
39
|
+
}
|
|
40
|
+
if (validation.warnings.length > 0 && options.outputMode === 'human') {
|
|
41
|
+
for (const warning of validation.warnings) {
|
|
42
|
+
console.log(formatWarning(`Schema warning: ${warning}`));
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
}
|
|
23
46
|
const result = await client.getPrompt(name, promptArgs);
|
|
24
47
|
console.log(formatOutput(result, options.outputMode));
|
|
25
48
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prompts.js","sourceRoot":"","sources":["../../../src/cli/commands/prompts.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;
|
|
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;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EACL,kBAAkB,EAClB,oBAAoB,EACpB,qBAAqB,GAGtB,MAAM,+BAA+B,CAAC;AAMvC,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,MAAc,EAAE,OAAuB;IACvE,MAAM,aAAa,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;QAEpD,MAAM,UAAU,GAAG,EAAE,CAAC;QACtB,IAAI,MAAM,GAAuB,SAAS,CAAC;QAE3C,GAAG,CAAC;YACF,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;YAChD,UAAU,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC;YACnC,MAAM,GAAG,MAAM,CAAC,UAAU,CAAC;QAC7B,CAAC,QAAQ,MAAM,EAAE;QAEjB,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,UAAU,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC;IAC5D,CAAC,CAAC,CAAC;AACL,CAAC;AAKD,MAAM,CAAC,KAAK,UAAU,SAAS,CAC7B,MAAc,EACd,IAAY,EACZ,OAEC;IAGD,MAAM,UAAU,GAAG,gBAAgB,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAGlD,MAAM,UAAU,GAA2B,EAAE,CAAC;IAC9C,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;QACtD,UAAU,CAAC,GAAG,CAAC,GAAG,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;IAC9E,CAAC;IAGD,IAAI,cAAwC,CAAC;IAC7C,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;QACnB,cAAc,GAAG,CAAC,MAAM,kBAAkB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAiB,CAAC;IAC9E,CAAC;IAED,MAAM,aAAa,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;QAEpD,MAAM,UAAU,GAAe,OAAO,CAAC,UAAU,IAAI,YAAY,CAAC;QAClE,IAAI,cAAc,IAAI,UAAU,KAAK,QAAQ,EAAE,CAAC;YAC9C,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,WAAW,EAAE,CAAC;YAC1C,MAAM,YAAY,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;YAEjE,IAAI,CAAC,YAAY,EAAE,CAAC;gBAClB,MAAM,IAAI,WAAW,CAAC,qBAAqB,IAAI,EAAE,CAAC,CAAC;YACrD,CAAC;YAED,MAAM,UAAU,GAAG,oBAAoB,CAAC,YAA4B,EAAE,cAAc,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC;YAE9G,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;gBACtB,MAAM,IAAI,WAAW,CAAC,qBAAqB,CAAC,UAAU,EAAE,WAAW,IAAI,GAAG,CAAC,CAAC,CAAC;YAC/E,CAAC;YAGD,IAAI,UAAU,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,IAAI,OAAO,CAAC,UAAU,KAAK,OAAO,EAAE,CAAC;gBACrE,KAAK,MAAM,OAAO,IAAI,UAAU,CAAC,QAAQ,EAAE,CAAC;oBAC1C,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,mBAAmB,OAAO,EAAE,CAAC,CAAC,CAAC;gBAC3D,CAAC;YACH,CAAC;QACH,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,SAAS,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QAExD,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,MAAM,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC;IACxD,CAAC,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -13,7 +13,7 @@ export declare function listSessionsAndAuthProfiles(options: {
|
|
|
13
13
|
export declare function closeSession(name: string, options: {
|
|
14
14
|
outputMode: OutputMode;
|
|
15
15
|
}): Promise<void>;
|
|
16
|
-
export declare function
|
|
16
|
+
export declare function showServerDetails(target: string, options: {
|
|
17
17
|
outputMode: OutputMode;
|
|
18
18
|
config?: string;
|
|
19
19
|
headers?: string[];
|
|
@@ -21,6 +21,10 @@ export declare function showServerInfo(target: string, options: {
|
|
|
21
21
|
verbose?: boolean;
|
|
22
22
|
hideTarget?: boolean;
|
|
23
23
|
}): Promise<void>;
|
|
24
|
+
export declare function restartSession(name: string, options: {
|
|
25
|
+
outputMode: OutputMode;
|
|
26
|
+
verbose?: boolean;
|
|
27
|
+
}): Promise<void>;
|
|
24
28
|
export declare function showHelp(target: string, options: {
|
|
25
29
|
outputMode: OutputMode;
|
|
26
30
|
}): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sessions.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/sessions.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,UAAU,
|
|
1
|
+
{"version":3,"file":"sessions.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/sessions.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,UAAU,EAAyF,MAAM,oBAAoB,CAAC;AAyBvI,wBAAsB,cAAc,CAClC,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,EACd,OAAO,EAAE;IAAE,UAAU,EAAE,UAAU,CAAC;IAAC,OAAO,CAAC,EAAE,OAAO,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,GAC9H,OAAO,CAAC,IAAI,CAAC,CAkKf;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,CAqFf;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,CA8Ef;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"}
|