@getmcp/cli 0.5.0 → 0.6.0
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/README.md +77 -12
- package/dist/app-selection.d.ts +44 -0
- package/dist/app-selection.d.ts.map +1 -0
- package/dist/app-selection.js +99 -0
- package/dist/app-selection.js.map +1 -0
- package/dist/bin.js +54 -1
- package/dist/bin.js.map +1 -1
- package/dist/commands/add.d.ts +6 -0
- package/dist/commands/add.d.ts.map +1 -1
- package/dist/commands/add.js +215 -11
- package/dist/commands/add.js.map +1 -1
- package/dist/commands/check.d.ts +4 -1
- package/dist/commands/check.d.ts.map +1 -1
- package/dist/commands/check.js +44 -8
- package/dist/commands/check.js.map +1 -1
- package/dist/commands/doctor.d.ts +17 -0
- package/dist/commands/doctor.d.ts.map +1 -0
- package/dist/commands/doctor.js +179 -0
- package/dist/commands/doctor.js.map +1 -0
- package/dist/commands/import.d.ts +13 -0
- package/dist/commands/import.d.ts.map +1 -0
- package/dist/commands/import.js +148 -0
- package/dist/commands/import.js.map +1 -0
- package/dist/commands/list.d.ts +2 -0
- package/dist/commands/list.d.ts.map +1 -1
- package/dist/commands/list.js +75 -6
- package/dist/commands/list.js.map +1 -1
- package/dist/commands/remove.d.ts +3 -0
- package/dist/commands/remove.d.ts.map +1 -1
- package/dist/commands/remove.js +20 -8
- package/dist/commands/remove.js.map +1 -1
- package/dist/commands/sync.d.ts +19 -0
- package/dist/commands/sync.d.ts.map +1 -0
- package/dist/commands/sync.js +214 -0
- package/dist/commands/sync.js.map +1 -0
- package/dist/commands/update.d.ts +2 -0
- package/dist/commands/update.d.ts.map +1 -1
- package/dist/commands/update.js +3 -3
- package/dist/commands/update.js.map +1 -1
- package/dist/config-file.d.ts +4 -0
- package/dist/config-file.d.ts.map +1 -1
- package/dist/config-file.js +12 -1
- package/dist/config-file.js.map +1 -1
- package/dist/detect.d.ts +17 -7
- package/dist/detect.d.ts.map +1 -1
- package/dist/detect.js +40 -17
- package/dist/detect.js.map +1 -1
- package/dist/errors.d.ts +3 -1
- package/dist/errors.d.ts.map +1 -1
- package/dist/errors.js +8 -9
- package/dist/errors.js.map +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -1
- package/dist/index.js.map +1 -1
- package/dist/lock.d.ts +47 -1
- package/dist/lock.d.ts.map +1 -1
- package/dist/lock.js +36 -3
- package/dist/lock.js.map +1 -1
- package/dist/utils.d.ts +14 -0
- package/dist/utils.d.ts.map +1 -1
- package/dist/utils.js +49 -1
- package/dist/utils.js.map +1 -1
- package/package.json +4 -4
package/dist/commands/add.js
CHANGED
|
@@ -16,15 +16,21 @@ import * as p from "@clack/prompts";
|
|
|
16
16
|
import { getAllServers, getServer, searchServers } from "@getmcp/registry";
|
|
17
17
|
import { getGenerator, getAppIds } from "@getmcp/generators";
|
|
18
18
|
import { isStdioConfig } from "@getmcp/core";
|
|
19
|
-
import {
|
|
19
|
+
import { generators } from "@getmcp/generators";
|
|
20
|
+
import { detectApps, resolveAppForScope } from "../detect.js";
|
|
21
|
+
import { resolveAppsFromFlags, resolveScope } from "../app-selection.js";
|
|
20
22
|
import { mergeServerIntoConfig, writeConfigFile } from "../config-file.js";
|
|
21
23
|
import { getSavedSelectedApps, saveSelectedApps } from "../preferences.js";
|
|
22
24
|
import { trackInstallation } from "../lock.js";
|
|
23
|
-
import { shortenPath } from "../utils.js";
|
|
25
|
+
import { shortenPath, isNonInteractive as checkNonInteractive } from "../utils.js";
|
|
24
26
|
import { ServerNotFoundError, AppNotDetectedError, InvalidAppError, NonInteractiveError, formatError, } from "../errors.js";
|
|
25
27
|
export async function addCommand(serverIdArg, options = {}) {
|
|
26
|
-
const isNonInteractive = options
|
|
28
|
+
const isNonInteractive = checkNonInteractive(options);
|
|
27
29
|
p.intro("getmcp add");
|
|
30
|
+
// Handle --from-npm / --from-pypi / --from-url (unverified packages)
|
|
31
|
+
if (options.fromNpm || options.fromPypi || options.fromUrl) {
|
|
32
|
+
return addUnverifiedServer(options);
|
|
33
|
+
}
|
|
28
34
|
// Step 1: Select server
|
|
29
35
|
let entry;
|
|
30
36
|
if (serverIdArg) {
|
|
@@ -128,7 +134,7 @@ export async function addCommand(serverIdArg, options = {}) {
|
|
|
128
134
|
// Step 3: Detect apps and build selection list
|
|
129
135
|
const allApps = detectApps();
|
|
130
136
|
const detected = allApps.filter((app) => app.exists);
|
|
131
|
-
const notDetectedProjectScoped = allApps.filter((app) => !app.exists && app.
|
|
137
|
+
const notDetectedProjectScoped = allApps.filter((app) => !app.exists && generators[app.id].app.configPaths !== null);
|
|
132
138
|
// Step 4: Select target apps
|
|
133
139
|
let selectedApps;
|
|
134
140
|
if (options.allApps) {
|
|
@@ -198,6 +204,12 @@ export async function addCommand(serverIdArg, options = {}) {
|
|
|
198
204
|
const initialValues = choices
|
|
199
205
|
.filter((c) => (hasSavedPreferences ? savedApps.includes(c.value.id) : c.value.exists))
|
|
200
206
|
.map((c) => c.value);
|
|
207
|
+
const initialIds = new Set(initialValues.map((v) => v.id));
|
|
208
|
+
choices.sort((a, b) => {
|
|
209
|
+
const aSelected = initialIds.has(a.value.id) ? 0 : 1;
|
|
210
|
+
const bSelected = initialIds.has(b.value.id) ? 0 : 1;
|
|
211
|
+
return aSelected - bSelected;
|
|
212
|
+
});
|
|
201
213
|
const selected = await p.multiselect({
|
|
202
214
|
message: "Select apps to configure:",
|
|
203
215
|
options: choices,
|
|
@@ -212,6 +224,36 @@ export async function addCommand(serverIdArg, options = {}) {
|
|
|
212
224
|
// Save selected apps for next run
|
|
213
225
|
saveSelectedApps(selectedApps.map((app) => app.id));
|
|
214
226
|
}
|
|
227
|
+
// Step 4.5: Scope selection for dual-scope apps
|
|
228
|
+
let chosenScope = "project";
|
|
229
|
+
const dualScopeApps = selectedApps.filter((a) => a.supportsBothScopes);
|
|
230
|
+
if (dualScopeApps.length > 0) {
|
|
231
|
+
if (options.global) {
|
|
232
|
+
chosenScope = "global";
|
|
233
|
+
}
|
|
234
|
+
else if (options.project) {
|
|
235
|
+
chosenScope = "project";
|
|
236
|
+
}
|
|
237
|
+
else if (isNonInteractive) {
|
|
238
|
+
chosenScope = "project";
|
|
239
|
+
}
|
|
240
|
+
else {
|
|
241
|
+
const scopeChoice = await p.select({
|
|
242
|
+
message: "Install globally or per-project?",
|
|
243
|
+
options: [
|
|
244
|
+
{ label: "Project", hint: "config in current directory", value: "project" },
|
|
245
|
+
{ label: "Global", hint: "config in home directory", value: "global" },
|
|
246
|
+
],
|
|
247
|
+
initialValue: "project",
|
|
248
|
+
});
|
|
249
|
+
if (p.isCancel(scopeChoice)) {
|
|
250
|
+
p.cancel("Operation cancelled.");
|
|
251
|
+
process.exit(0);
|
|
252
|
+
}
|
|
253
|
+
chosenScope = scopeChoice;
|
|
254
|
+
}
|
|
255
|
+
selectedApps = selectedApps.map((app) => resolveAppForScope(app, chosenScope));
|
|
256
|
+
}
|
|
215
257
|
// Step 5+6: Generate and merge for each selected app
|
|
216
258
|
if (options.dryRun) {
|
|
217
259
|
p.log.step("Dry run — showing what would be written:\n");
|
|
@@ -245,6 +287,35 @@ export async function addCommand(serverIdArg, options = {}) {
|
|
|
245
287
|
}
|
|
246
288
|
}
|
|
247
289
|
spin.stop("Configuration complete.");
|
|
290
|
+
// Track installation (unless dry-run)
|
|
291
|
+
if (!options.dryRun) {
|
|
292
|
+
const successResults = results.filter((r) => r.ok);
|
|
293
|
+
const successAppIds = successResults.map((r) => r.app.id);
|
|
294
|
+
if (successAppIds.length > 0) {
|
|
295
|
+
const scopes = {};
|
|
296
|
+
for (const r of successResults) {
|
|
297
|
+
scopes[r.app.id] = r.app.supportsBothScopes ? chosenScope : "project";
|
|
298
|
+
}
|
|
299
|
+
trackInstallation(entry.id, successAppIds, entry.requiredEnvVars, undefined, scopes);
|
|
300
|
+
}
|
|
301
|
+
}
|
|
302
|
+
// JSON output mode
|
|
303
|
+
if (options.json) {
|
|
304
|
+
const output = {
|
|
305
|
+
server: entry.id,
|
|
306
|
+
name: entry.name,
|
|
307
|
+
dryRun: options.dryRun ?? false,
|
|
308
|
+
apps: results.map((r) => ({
|
|
309
|
+
id: r.app.id,
|
|
310
|
+
name: r.app.name,
|
|
311
|
+
configPath: r.app.configPath,
|
|
312
|
+
ok: r.ok,
|
|
313
|
+
...(r.error ? { error: r.error } : {}),
|
|
314
|
+
})),
|
|
315
|
+
};
|
|
316
|
+
console.log(JSON.stringify(output, null, 2));
|
|
317
|
+
return;
|
|
318
|
+
}
|
|
248
319
|
// Show results summary
|
|
249
320
|
for (const r of results) {
|
|
250
321
|
if (r.ok) {
|
|
@@ -254,13 +325,6 @@ export async function addCommand(serverIdArg, options = {}) {
|
|
|
254
325
|
p.log.error(`${r.app.name}: ${r.error}`);
|
|
255
326
|
}
|
|
256
327
|
}
|
|
257
|
-
// Track installation (unless dry-run)
|
|
258
|
-
if (!options.dryRun) {
|
|
259
|
-
const successApps = results.filter((r) => r.ok).map((r) => r.app.id);
|
|
260
|
-
if (successApps.length > 0) {
|
|
261
|
-
trackInstallation(entry.id, successApps, entry.requiredEnvVars);
|
|
262
|
-
}
|
|
263
|
-
}
|
|
264
328
|
const action = options.dryRun ? "would be configured" : "has been configured";
|
|
265
329
|
p.outro(`"${entry.name}" ${action}.`);
|
|
266
330
|
// Reminder for apps that need restart
|
|
@@ -276,6 +340,146 @@ export async function addCommand(serverIdArg, options = {}) {
|
|
|
276
340
|
" PyCharm must be closed and reopened for changes to take effect.");
|
|
277
341
|
}
|
|
278
342
|
}
|
|
343
|
+
async function addUnverifiedServer(options) {
|
|
344
|
+
const isNonInteractive = checkNonInteractive(options);
|
|
345
|
+
let serverName;
|
|
346
|
+
let config;
|
|
347
|
+
if (options.fromUrl) {
|
|
348
|
+
// Remote server from URL
|
|
349
|
+
const url = options.fromUrl;
|
|
350
|
+
serverName = new URL(url).hostname.replace(/\./g, "-");
|
|
351
|
+
config = { url };
|
|
352
|
+
p.log.warn("Unverified remote server — not from the getmcp registry.");
|
|
353
|
+
}
|
|
354
|
+
else if (options.fromNpm) {
|
|
355
|
+
// npm package
|
|
356
|
+
const pkg = options.fromNpm;
|
|
357
|
+
serverName = pkg.replace(/^@/, "").replace(/\//g, "-");
|
|
358
|
+
config = {
|
|
359
|
+
command: "npx",
|
|
360
|
+
args: ["-y", pkg],
|
|
361
|
+
};
|
|
362
|
+
p.log.warn(`Unverified npm package: ${pkg} — not from the getmcp registry.`);
|
|
363
|
+
}
|
|
364
|
+
else if (options.fromPypi) {
|
|
365
|
+
// PyPI package
|
|
366
|
+
const pkg = options.fromPypi;
|
|
367
|
+
serverName = pkg.replace(/\//g, "-");
|
|
368
|
+
config = {
|
|
369
|
+
command: "uvx",
|
|
370
|
+
args: [pkg],
|
|
371
|
+
};
|
|
372
|
+
p.log.warn(`Unverified PyPI package: ${pkg} — not from the getmcp registry.`);
|
|
373
|
+
}
|
|
374
|
+
else {
|
|
375
|
+
return;
|
|
376
|
+
}
|
|
377
|
+
p.log.info(`Server name: ${serverName}`);
|
|
378
|
+
// Detect apps and select using shared helper
|
|
379
|
+
const resolved = resolveAppsFromFlags(options);
|
|
380
|
+
let selectedApps;
|
|
381
|
+
if (!resolved) {
|
|
382
|
+
p.outro("Done");
|
|
383
|
+
return;
|
|
384
|
+
}
|
|
385
|
+
if (resolved.apps.length === 0 && !isNonInteractive) {
|
|
386
|
+
const detected = resolved.allApps.filter((app) => app.exists);
|
|
387
|
+
if (detected.length === 0) {
|
|
388
|
+
p.log.warn("No AI applications detected.");
|
|
389
|
+
p.outro("Done");
|
|
390
|
+
return;
|
|
391
|
+
}
|
|
392
|
+
const selected = await p.multiselect({
|
|
393
|
+
message: "Select apps to configure:",
|
|
394
|
+
options: detected.map((app) => ({
|
|
395
|
+
label: app.name,
|
|
396
|
+
value: app,
|
|
397
|
+
hint: shortenPath(app.configPath),
|
|
398
|
+
})),
|
|
399
|
+
initialValues: detected,
|
|
400
|
+
required: true,
|
|
401
|
+
});
|
|
402
|
+
if (p.isCancel(selected)) {
|
|
403
|
+
p.cancel("Operation cancelled.");
|
|
404
|
+
process.exit(0);
|
|
405
|
+
}
|
|
406
|
+
selectedApps = selected;
|
|
407
|
+
}
|
|
408
|
+
else if (resolved.apps.length === 0) {
|
|
409
|
+
p.log.error(new AppNotDetectedError().format());
|
|
410
|
+
p.outro("Done");
|
|
411
|
+
return;
|
|
412
|
+
}
|
|
413
|
+
else {
|
|
414
|
+
selectedApps = resolved.apps;
|
|
415
|
+
}
|
|
416
|
+
// Scope selection using shared helper
|
|
417
|
+
const { apps: scopedApps, scope: chosenScope } = await resolveScope(selectedApps, options, isNonInteractive);
|
|
418
|
+
selectedApps = scopedApps;
|
|
419
|
+
// Generate and merge
|
|
420
|
+
if (options.dryRun) {
|
|
421
|
+
p.log.step("Dry run — showing what would be written:\n");
|
|
422
|
+
}
|
|
423
|
+
const results = [];
|
|
424
|
+
for (const app of selectedApps) {
|
|
425
|
+
try {
|
|
426
|
+
const generator = getGenerator(app.id);
|
|
427
|
+
const generatedConfig = generator.generate(serverName, config);
|
|
428
|
+
if (options.dryRun) {
|
|
429
|
+
const serialized = generator.serialize(generatedConfig);
|
|
430
|
+
p.note(`File: ${shortenPath(app.configPath)}\n\n${serialized}`, app.name);
|
|
431
|
+
results.push({ app, ok: true });
|
|
432
|
+
}
|
|
433
|
+
else {
|
|
434
|
+
const merged = mergeServerIntoConfig(app.configPath, generatedConfig);
|
|
435
|
+
writeConfigFile(app.configPath, merged);
|
|
436
|
+
results.push({ app, ok: true });
|
|
437
|
+
}
|
|
438
|
+
}
|
|
439
|
+
catch (err) {
|
|
440
|
+
results.push({ app, ok: false, error: formatError(err) });
|
|
441
|
+
}
|
|
442
|
+
}
|
|
443
|
+
// Track (with source info)
|
|
444
|
+
if (!options.dryRun) {
|
|
445
|
+
const successResults = results.filter((r) => r.ok);
|
|
446
|
+
const successAppIds = successResults.map((r) => r.app.id);
|
|
447
|
+
if (successAppIds.length > 0) {
|
|
448
|
+
const scopes = {};
|
|
449
|
+
for (const r of successResults) {
|
|
450
|
+
scopes[r.app.id] = r.app.supportsBothScopes ? chosenScope : "project";
|
|
451
|
+
}
|
|
452
|
+
trackInstallation(serverName, successAppIds, [], undefined, scopes);
|
|
453
|
+
}
|
|
454
|
+
}
|
|
455
|
+
if (options.json) {
|
|
456
|
+
const output = {
|
|
457
|
+
server: serverName,
|
|
458
|
+
name: serverName,
|
|
459
|
+
source: options.fromNpm ? "npm" : options.fromPypi ? "pypi" : "url",
|
|
460
|
+
dryRun: options.dryRun ?? false,
|
|
461
|
+
apps: results.map((r) => ({
|
|
462
|
+
id: r.app.id,
|
|
463
|
+
name: r.app.name,
|
|
464
|
+
configPath: r.app.configPath,
|
|
465
|
+
ok: r.ok,
|
|
466
|
+
...(r.error ? { error: r.error } : {}),
|
|
467
|
+
})),
|
|
468
|
+
};
|
|
469
|
+
console.log(JSON.stringify(output, null, 2));
|
|
470
|
+
return;
|
|
471
|
+
}
|
|
472
|
+
for (const r of results) {
|
|
473
|
+
if (r.ok) {
|
|
474
|
+
p.log.success(`${r.app.name}: ${shortenPath(r.app.configPath)}`);
|
|
475
|
+
}
|
|
476
|
+
else {
|
|
477
|
+
p.log.error(`${r.app.name}: ${r.error}`);
|
|
478
|
+
}
|
|
479
|
+
}
|
|
480
|
+
const action = options.dryRun ? "would be configured" : "has been configured";
|
|
481
|
+
p.outro(`"${serverName}" ${action}.`);
|
|
482
|
+
}
|
|
279
483
|
function printManualConfig(entry, config) {
|
|
280
484
|
const canonical = {
|
|
281
485
|
mcpServers: {
|
package/dist/commands/add.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add.js","sourceRoot":"","sources":["../../src/commands/add.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"add.js","sourceRoot":"","sources":["../../src/commands/add.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,KAAK,CAAC,MAAM,gBAAgB,CAAC;AACpC,OAAO,EAAE,aAAa,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAC3E,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC7D,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAE7C,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,kBAAkB,EAAoB,MAAM,cAAc,CAAC;AAChF,OAAO,EAAE,oBAAoB,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACzE,OAAO,EAAE,qBAAqB,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAC3E,OAAO,EAAE,oBAAoB,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC3E,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAC/C,OAAO,EAAE,WAAW,EAAE,gBAAgB,IAAI,mBAAmB,EAAE,MAAM,aAAa,CAAC;AACnF,OAAO,EACL,mBAAmB,EACnB,mBAAmB,EACnB,eAAe,EACf,mBAAmB,EACnB,WAAW,GACZ,MAAM,cAAc,CAAC;AAetB,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,WAAoB,EAAE,UAAsB,EAAE;IAC7E,MAAM,gBAAgB,GAAG,mBAAmB,CAAC,OAAO,CAAC,CAAC;IAEtD,CAAC,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;IAEtB,qEAAqE;IACrE,IAAI,OAAO,CAAC,OAAO,IAAI,OAAO,CAAC,QAAQ,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;QAC3D,OAAO,mBAAmB,CAAC,OAAO,CAAC,CAAC;IACtC,CAAC;IAED,wBAAwB;IACxB,IAAI,KAAwB,CAAC;IAE7B,IAAI,WAAW,EAAE,CAAC;QAChB,MAAM,KAAK,GAAG,SAAS,CAAC,WAAW,CAAC,CAAC;QACrC,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,mBAAmB;YACnB,MAAM,OAAO,GAAG,aAAa,CAAC,WAAW,CAAC,CAAC;YAC3C,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACzB,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,mBAAmB,CAAC,WAAW,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC;gBAC3D,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAClB,CAAC;YACD,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACzB,KAAK,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;YACrB,CAAC;iBAAM,IAAI,gBAAgB,EAAE,CAAC;gBAC5B,4CAA4C;gBAC5C,KAAK,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;gBACnB,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,yBAAyB,WAAW,aAAa,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;YACjF,CAAC;iBAAM,CAAC;gBACN,MAAM,QAAQ,GAAG,MAAM,CAAC,CAAC,MAAM,CAAC;oBAC9B,OAAO,EAAE,yBAAyB,WAAW,cAAc;oBAC3D,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;wBAC3B,KAAK,EAAE,CAAC,CAAC,IAAI;wBACb,IAAI,EAAE,CAAC,CAAC,WAAW;wBACnB,KAAK,EAAE,CAAC;qBACT,CAAC,CAAC;iBACJ,CAAC,CAAC;gBAEH,IAAI,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;oBACzB,CAAC,CAAC,MAAM,CAAC,sBAAsB,CAAC,CAAC;oBACjC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;gBAClB,CAAC;gBACD,KAAK,GAAG,QAAQ,CAAC;YACnB,CAAC;QACH,CAAC;aAAM,CAAC;YACN,KAAK,GAAG,KAAK,CAAC;QAChB,CAAC;IACH,CAAC;SAAM,IAAI,gBAAgB,EAAE,CAAC;QAC5B,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,mBAAmB,CAAC,+CAA+C,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC;QAC/F,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;SAAM,CAAC;QACN,MAAM,OAAO,GAAG,aAAa,EAAE,CAAC;QAChC,MAAM,QAAQ,GAAG,MAAM,CAAC,CAAC,MAAM,CAAC;YAC9B,OAAO,EAAE,kCAAkC;YAC3C,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;gBAC3B,KAAK,EAAE,CAAC,CAAC,IAAI;gBACb,IAAI,EAAE,CAAC,CAAC,WAAW;gBACnB,KAAK,EAAE,CAAC;aACT,CAAC,CAAC;SACJ,CAAC,CAAC;QAEH,IAAI,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;YACzB,CAAC,CAAC,MAAM,CAAC,sBAAsB,CAAC,CAAC;YACjC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;QACD,KAAK,GAAG,QAAQ,CAAC;IACnB,CAAC;IAED,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,eAAe,KAAK,CAAC,IAAI,OAAO,KAAK,CAAC,WAAW,EAAE,CAAC,CAAC;IAEhE,oDAAoD;IACpD,MAAM,MAAM,GAAG,eAAe,CAAC,KAAK,CAAC,MAAM,CAA0B,CAAC;IAEtE,IAAI,KAAK,CAAC,eAAe,CAAC,MAAM,GAAG,CAAC,IAAI,aAAa,CAAC,MAAM,CAAC,EAAE,CAAC;QAC9D,IAAI,gBAAgB,EAAE,CAAC;YACrB,gFAAgF;YAChF,IAAI,MAAM,GAAG,IAAI,CAAC;YAClB,KAAK,MAAM,MAAM,IAAI,KAAK,CAAC,eAAe,EAAE,CAAC;gBAC3C,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;gBACrC,IAAI,QAAQ,EAAE,CAAC;oBACb,MAAM,CAAC,GAAI,CAAC,MAAM,CAAC,GAAG,QAAQ,CAAC;gBACjC,CAAC;qBAAM,CAAC;oBACN,MAAM,GAAG,KAAK,CAAC;oBACf,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,oBAAoB,MAAM,4BAA4B,CAAC,CAAC;gBACrE,CAAC;YACH,CAAC;YACD,IAAI,CAAC,MAAM,EAAE,CAAC;gBACZ,CAAC,CAAC,GAAG,CAAC,IAAI,CACR,4KAA4K,CAC7K,CAAC;YACJ,CAAC;QACH,CAAC;aAAM,CAAC;YACN,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,6CAA6C,CAAC,CAAC;YAC1D,KAAK,MAAM,MAAM,IAAI,KAAK,CAAC,eAAe,EAAE,CAAC;gBAC3C,MAAM,WAAW,GAAG,kBAAkB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;gBACpD,MAAM,QAAQ,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;gBACnD,MAAM,KAAK,GAAG,MAAM,QAAQ,CAAC;oBAC3B,OAAO,EAAE,GAAG,MAAM,GAAG;oBACrB,QAAQ,EAAE,CAAC,GAAG,EAAE,EAAE;wBAChB,IAAI,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE;4BAAE,OAAO,GAAG,MAAM,cAAc,CAAC;oBAC1D,CAAC;iBACF,CAAC,CAAC;gBAEH,IAAI,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;oBACtB,CAAC,CAAC,MAAM,CAAC,sBAAsB,CAAC,CAAC;oBACjC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;gBAClB,CAAC;gBACD,MAAM,CAAC,GAAI,CAAC,MAAM,CAAC,GAAI,KAAgB,CAAC,IAAI,EAAE,CAAC;YACjD,CAAC;QACH,CAAC;IACH,CAAC;IAED,+CAA+C;IAC/C,MAAM,OAAO,GAAG,UAAU,EAAE,CAAC;IAC7B,MAAM,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IACrD,MAAM,wBAAwB,GAAG,OAAO,CAAC,MAAM,CAC7C,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,MAAM,IAAI,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,WAAW,KAAK,IAAI,CACpE,CAAC;IAEF,6BAA6B;IAC7B,IAAI,YAA2B,CAAC;IAEhC,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;QACpB,oCAAoC;QACpC,YAAY,GAAG,QAAQ,CAAC;QACxB,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC9B,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,mBAAmB,EAAE,CAAC,MAAM,EAAE,CAAC,CAAC;YAChD,iBAAiB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;YACjC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YAChB,OAAO;QACT,CAAC;IACH,CAAC;SAAM,IAAI,OAAO,CAAC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACnD,iCAAiC;QACjC,MAAM,QAAQ,GAAG,SAAS,EAAE,CAAC;QAC7B,YAAY,GAAG,EAAE,CAAC;QAElB,KAAK,MAAM,KAAK,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;YACjC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,KAAkB,CAAC,EAAE,CAAC;gBAC3C,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,eAAe,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC;gBAC3D,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAClB,CAAC;YAED,MAAM,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,KAAK,CAAC,CAAC;YAChD,IAAI,GAAG,EAAE,CAAC;gBACR,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACzB,CAAC;iBAAM,CAAC;gBACN,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,KAAK,mDAAmD,CAAC,CAAC;YAC/E,CAAC;QACH,CAAC;QAED,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC9B,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,4DAA4D,CAAC,CAAC;YAC1E,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;IACH,CAAC;SAAM,IAAI,gBAAgB,EAAE,CAAC;QAC5B,kDAAkD;QAClD,YAAY,GAAG,QAAQ,CAAC;QACxB,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC9B,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,mBAAmB,EAAE,CAAC,MAAM,EAAE,CAAC,CAAC;YAChD,iBAAiB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;YACjC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YAChB,OAAO;QACT,CAAC;IACH,CAAC;SAAM,CAAC;QACN,mBAAmB;QACnB,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,IAAI,wBAAwB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACnE,CAAC,CAAC,GAAG,CAAC,IAAI,CACR,6FAA6F,CAC9F,CAAC;YACF,iBAAiB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;YACjC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YAChB,OAAO;QACT,CAAC;QAED,MAAM,SAAS,GAAG,oBAAoB,EAAE,CAAC;QACzC,MAAM,mBAAmB,GAAG,SAAS,KAAK,IAAI,CAAC;QAE/C,MAAM,OAAO,GAAG;YACd,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;gBACxB,KAAK,EAAE,GAAG,CAAC,IAAI;gBACf,KAAK,EAAE,GAAG;gBACV,IAAI,EAAE,WAAW,CAAC,GAAG,CAAC,UAAU,CAAC;aAClC,CAAC,CAAC;YACH,GAAG,wBAAwB,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;gBACxC,KAAK,EAAE,GAAG,CAAC,IAAI;gBACf,KAAK,EAAE,GAAG;gBACV,IAAI,EAAE,GAAG,WAAW,CAAC,GAAG,CAAC,UAAU,CAAC,iBAAiB;aACtD,CAAC,CAAC;SACJ,CAAC;QAEF,MAAM,aAAa,GAAG,OAAO;aAC1B,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;aACtF,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;QAEvB,MAAM,UAAU,GAAG,IAAI,GAAG,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAC3D,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;YACpB,MAAM,SAAS,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACrD,MAAM,SAAS,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACrD,OAAO,SAAS,GAAG,SAAS,CAAC;QAC/B,CAAC,CAAC,CAAC;QAEH,MAAM,QAAQ,GAAG,MAAM,CAAC,CAAC,WAAW,CAAC;YACnC,OAAO,EAAE,2BAA2B;YACpC,OAAO,EAAE,OAAO;YAChB,aAAa;YACb,QAAQ,EAAE,IAAI;SACf,CAAC,CAAC;QAEH,IAAI,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;YACzB,CAAC,CAAC,MAAM,CAAC,sBAAsB,CAAC,CAAC;YACjC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;QAED,YAAY,GAAG,QAAQ,CAAC;QAExB,kCAAkC;QAClC,gBAAgB,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;IACtD,CAAC;IAED,gDAAgD;IAChD,IAAI,WAAW,GAAyB,SAAS,CAAC;IAClD,MAAM,aAAa,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC;IACvE,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC7B,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;YACnB,WAAW,GAAG,QAAQ,CAAC;QACzB,CAAC;aAAM,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;YAC3B,WAAW,GAAG,SAAS,CAAC;QAC1B,CAAC;aAAM,IAAI,gBAAgB,EAAE,CAAC;YAC5B,WAAW,GAAG,SAAS,CAAC;QAC1B,CAAC;aAAM,CAAC;YACN,MAAM,WAAW,GAAG,MAAM,CAAC,CAAC,MAAM,CAAC;gBACjC,OAAO,EAAE,kCAAkC;gBAC3C,OAAO,EAAE;oBACP,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,6BAA6B,EAAE,KAAK,EAAE,SAAkB,EAAE;oBACpF,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,0BAA0B,EAAE,KAAK,EAAE,QAAiB,EAAE;iBAChF;gBACD,YAAY,EAAE,SAAkB;aACjC,CAAC,CAAC;YACH,IAAI,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;gBAC5B,CAAC,CAAC,MAAM,CAAC,sBAAsB,CAAC,CAAC;gBACjC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAClB,CAAC;YACD,WAAW,GAAG,WAAW,CAAC;QAC5B,CAAC;QACD,YAAY,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,kBAAkB,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC,CAAC;IACjF,CAAC;IAED,qDAAqD;IACrD,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;QACnB,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,4CAA4C,CAAC,CAAC;IAC3D,CAAC;IAED,MAAM,IAAI,GAAG,CAAC,CAAC,OAAO,EAAE,CAAC;IACzB,IAAI,CAAC,KAAK,CAAC,eAAe,YAAY,CAAC,MAAM,YAAY,CAAC,CAAC;IAE3D,MAAM,OAAO,GAAwD,EAAE,CAAC;IAExE,KAAK,MAAM,GAAG,IAAI,YAAY,EAAE,CAAC;QAC/B,IAAI,CAAC;YACH,MAAM,SAAS,GAAG,YAAY,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YACvC,MAAM,eAAe,GAAG,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;YAE7D,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;gBACnB,IAAI,CAAC,IAAI,CAAC,eAAe,GAAG,CAAC,IAAI,GAAG,CAAC,CAAC;gBACtC,MAAM,UAAU,GAAG,SAAS,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC;gBACxD,CAAC,CAAC,IAAI,CAAC,SAAS,WAAW,CAAC,GAAG,CAAC,UAAU,CAAC,OAAO,UAAU,EAAE,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC;gBAC1E,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;gBAC5B,OAAO,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC;YAClC,CAAC;iBAAM,CAAC;gBACN,MAAM,MAAM,GAAG,qBAAqB,CAAC,GAAG,CAAC,UAAU,EAAE,eAAe,CAAC,CAAC;gBACtE,eAAe,CAAC,GAAG,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;gBACxC,OAAO,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC;YAClC,CAAC;QACH,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO,CAAC,IAAI,CAAC;gBACX,GAAG;gBACH,EAAE,EAAE,KAAK;gBACT,KAAK,EAAE,WAAW,CAAC,GAAG,CAAC;aACxB,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,IAAI,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;IAErC,sCAAsC;IACtC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;QACpB,MAAM,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QACnD,MAAM,aAAa,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAC1D,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC7B,MAAM,MAAM,GAAyC,EAAE,CAAC;YACxD,KAAK,MAAM,CAAC,IAAI,cAAc,EAAE,CAAC;gBAC/B,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC;YACxE,CAAC;YACD,iBAAiB,CAAC,KAAK,CAAC,EAAE,EAAE,aAAa,EAAE,KAAK,CAAC,eAAe,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;QACvF,CAAC;IACH,CAAC;IAED,mBAAmB;IACnB,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;QACjB,MAAM,MAAM,GAAG;YACb,MAAM,EAAE,KAAK,CAAC,EAAE;YAChB,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,MAAM,EAAE,OAAO,CAAC,MAAM,IAAI,KAAK;YAC/B,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;gBACxB,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,EAAE;gBACZ,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,IAAI;gBAChB,UAAU,EAAE,CAAC,CAAC,GAAG,CAAC,UAAU;gBAC5B,EAAE,EAAE,CAAC,CAAC,EAAE;gBACR,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aACvC,CAAC,CAAC;SACJ,CAAC;QACF,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QAC7C,OAAO;IACT,CAAC;IAED,uBAAuB;IACvB,KAAK,MAAM,CAAC,IAAI,OAAO,EAAE,CAAC;QACxB,IAAI,CAAC,CAAC,EAAE,EAAE,CAAC;YACT,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,IAAI,KAAK,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;QACnE,CAAC;aAAM,CAAC;YACN,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC;QAC3C,CAAC;IACH,CAAC;IAED,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,qBAAqB,CAAC;IAC9E,CAAC,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,IAAI,KAAK,MAAM,GAAG,CAAC,CAAC;IAEtC,sCAAsC;IACtC,MAAM,YAAY,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAC3C,CAAC,gBAAgB,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CACxD,CAAC;IACF,IAAI,YAAY,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;QACpC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,wDAAwD,CAAC,CAAC;IACvE,CAAC;IAED,2BAA2B;IAC3B,MAAM,UAAU,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,SAAS,CAAC,CAAC;IAChE,IAAI,UAAU,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;QAClC,CAAC,CAAC,GAAG,CAAC,IAAI,CACR,qEAAqE;YACnE,yEAAyE;YACzE,mEAAmE,CACtE,CAAC;IACJ,CAAC;AACH,CAAC;AAED,KAAK,UAAU,mBAAmB,CAAC,OAAmB;IACpD,MAAM,gBAAgB,GAAG,mBAAmB,CAAC,OAAO,CAAC,CAAC;IAEtD,IAAI,UAAkB,CAAC;IACvB,IAAI,MAA6B,CAAC;IAElC,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;QACpB,yBAAyB;QACzB,MAAM,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC;QAC5B,UAAU,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QACvD,MAAM,GAAG,EAAE,GAAG,EAA2B,CAAC;QAC1C,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,0DAA0D,CAAC,CAAC;IACzE,CAAC;SAAM,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;QAC3B,cAAc;QACd,MAAM,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC;QAC5B,UAAU,GAAG,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QACvD,MAAM,GAAG;YACP,OAAO,EAAE,KAAK;YACd,IAAI,EAAE,CAAC,IAAI,EAAE,GAAG,CAAC;SACO,CAAC;QAC3B,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,2BAA2B,GAAG,kCAAkC,CAAC,CAAC;IAC/E,CAAC;SAAM,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;QAC5B,eAAe;QACf,MAAM,GAAG,GAAG,OAAO,CAAC,QAAQ,CAAC;QAC7B,UAAU,GAAG,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QACrC,MAAM,GAAG;YACP,OAAO,EAAE,KAAK;YACd,IAAI,EAAE,CAAC,GAAG,CAAC;SACa,CAAC;QAC3B,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,4BAA4B,GAAG,kCAAkC,CAAC,CAAC;IAChF,CAAC;SAAM,CAAC;QACN,OAAO;IACT,CAAC;IAED,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,gBAAgB,UAAU,EAAE,CAAC,CAAC;IAEzC,6CAA6C;IAC7C,MAAM,QAAQ,GAAG,oBAAoB,CAAC,OAAO,CAAC,CAAC;IAE/C,IAAI,YAA2B,CAAC;IAEhC,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAChB,OAAO;IACT,CAAC;IAED,IAAI,QAAQ,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACpD,MAAM,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAC9D,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC1B,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,8BAA8B,CAAC,CAAC;YAC3C,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YAChB,OAAO;QACT,CAAC;QACD,MAAM,QAAQ,GAAG,MAAM,CAAC,CAAC,WAAW,CAAC;YACnC,OAAO,EAAE,2BAA2B;YACpC,OAAO,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;gBAC9B,KAAK,EAAE,GAAG,CAAC,IAAI;gBACf,KAAK,EAAE,GAAG;gBACV,IAAI,EAAE,WAAW,CAAC,GAAG,CAAC,UAAU,CAAC;aAClC,CAAC,CAAC;YACH,aAAa,EAAE,QAAQ;YACvB,QAAQ,EAAE,IAAI;SACf,CAAC,CAAC;QAEH,IAAI,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;YACzB,CAAC,CAAC,MAAM,CAAC,sBAAsB,CAAC,CAAC;YACjC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;QACD,YAAY,GAAG,QAAQ,CAAC;IAC1B,CAAC;SAAM,IAAI,QAAQ,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACtC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,mBAAmB,EAAE,CAAC,MAAM,EAAE,CAAC,CAAC;QAChD,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAChB,OAAO;IACT,CAAC;SAAM,CAAC;QACN,YAAY,GAAG,QAAQ,CAAC,IAAI,CAAC;IAC/B,CAAC;IAED,sCAAsC;IACtC,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,WAAW,EAAE,GAAG,MAAM,YAAY,CACjE,YAAY,EACZ,OAAO,EACP,gBAAgB,CACjB,CAAC;IACF,YAAY,GAAG,UAAU,CAAC;IAE1B,qBAAqB;IACrB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;QACnB,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,4CAA4C,CAAC,CAAC;IAC3D,CAAC;IAED,MAAM,OAAO,GAAwD,EAAE,CAAC;IAExE,KAAK,MAAM,GAAG,IAAI,YAAY,EAAE,CAAC;QAC/B,IAAI,CAAC;YACH,MAAM,SAAS,GAAG,YAAY,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YACvC,MAAM,eAAe,GAAG,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;YAE/D,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;gBACnB,MAAM,UAAU,GAAG,SAAS,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC;gBACxD,CAAC,CAAC,IAAI,CAAC,SAAS,WAAW,CAAC,GAAG,CAAC,UAAU,CAAC,OAAO,UAAU,EAAE,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC;gBAC1E,OAAO,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC;YAClC,CAAC;iBAAM,CAAC;gBACN,MAAM,MAAM,GAAG,qBAAqB,CAAC,GAAG,CAAC,UAAU,EAAE,eAAe,CAAC,CAAC;gBACtE,eAAe,CAAC,GAAG,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;gBACxC,OAAO,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC;YAClC,CAAC;QACH,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAC5D,CAAC;IACH,CAAC;IAED,2BAA2B;IAC3B,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;QACpB,MAAM,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QACnD,MAAM,aAAa,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAC1D,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC7B,MAAM,MAAM,GAAyC,EAAE,CAAC;YACxD,KAAK,MAAM,CAAC,IAAI,cAAc,EAAE,CAAC;gBAC/B,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC;YACxE,CAAC;YACD,iBAAiB,CAAC,UAAU,EAAE,aAAa,EAAE,EAAE,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;QACtE,CAAC;IACH,CAAC;IAED,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;QACjB,MAAM,MAAM,GAAG;YACb,MAAM,EAAE,UAAU;YAClB,IAAI,EAAE,UAAU;YAChB,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK;YACnE,MAAM,EAAE,OAAO,CAAC,MAAM,IAAI,KAAK;YAC/B,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;gBACxB,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,EAAE;gBACZ,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,IAAI;gBAChB,UAAU,EAAE,CAAC,CAAC,GAAG,CAAC,UAAU;gBAC5B,EAAE,EAAE,CAAC,CAAC,EAAE;gBACR,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aACvC,CAAC,CAAC;SACJ,CAAC;QACF,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QAC7C,OAAO;IACT,CAAC;IAED,KAAK,MAAM,CAAC,IAAI,OAAO,EAAE,CAAC;QACxB,IAAI,CAAC,CAAC,EAAE,EAAE,CAAC;YACT,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,IAAI,KAAK,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;QACnE,CAAC;aAAM,CAAC;YACN,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC;QAC3C,CAAC;IACH,CAAC;IAED,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,qBAAqB,CAAC;IAC9E,CAAC,CAAC,KAAK,CAAC,IAAI,UAAU,KAAK,MAAM,GAAG,CAAC,CAAC;AACxC,CAAC;AAED,SAAS,iBAAiB,CAAC,KAAwB,EAAE,MAA6B;IAChF,MAAM,SAAS,GAAG;QAChB,UAAU,EAAE;YACV,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,MAAM;SACnB;KACF,CAAC;IACF,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,kBAAkB,CAAC,CAAC;AACjE,CAAC;AAED;;GAEG;AACH,MAAM,kBAAkB,GAAG,wDAAwD,CAAC"}
|
package/dist/commands/check.d.ts
CHANGED
|
@@ -5,5 +5,8 @@
|
|
|
5
5
|
* which tracked servers are still available, and reports any
|
|
6
6
|
* apps where the server may have been removed externally.
|
|
7
7
|
*/
|
|
8
|
-
export
|
|
8
|
+
export interface CheckOptions {
|
|
9
|
+
json?: boolean;
|
|
10
|
+
}
|
|
11
|
+
export declare function checkCommand(options?: CheckOptions): Promise<void>;
|
|
9
12
|
//# sourceMappingURL=check.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"check.d.ts","sourceRoot":"","sources":["../../src/commands/check.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AASH,
|
|
1
|
+
{"version":3,"file":"check.d.ts","sourceRoot":"","sources":["../../src/commands/check.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AASH,MAAM,WAAW,YAAY;IAC3B,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAED,wBAAsB,YAAY,CAAC,OAAO,GAAE,YAAiB,GAAG,OAAO,CAAC,IAAI,CAAC,CAkH5E"}
|
package/dist/commands/check.js
CHANGED
|
@@ -8,21 +8,55 @@
|
|
|
8
8
|
import * as p from "@clack/prompts";
|
|
9
9
|
import { getServer } from "@getmcp/registry";
|
|
10
10
|
import { getTrackedServers } from "../lock.js";
|
|
11
|
-
import {
|
|
11
|
+
import { detectApps, resolveAppForScope } from "../detect.js";
|
|
12
12
|
import { listServersInConfig } from "../config-file.js";
|
|
13
13
|
import { shortenPath } from "../utils.js";
|
|
14
|
-
export async function checkCommand() {
|
|
15
|
-
p.intro("getmcp check");
|
|
14
|
+
export async function checkCommand(options = {}) {
|
|
16
15
|
const lock = getTrackedServers();
|
|
17
16
|
const entries = Object.entries(lock.installations);
|
|
17
|
+
const allDetectedApps = detectApps();
|
|
18
|
+
const installedAppIds = new Set(allDetectedApps.filter((a) => a.exists).map((a) => a.id));
|
|
19
|
+
const appConfigMap = new Map(allDetectedApps.map((a) => [a.id, a]));
|
|
20
|
+
if (options.json) {
|
|
21
|
+
const results = entries.map(([serverId, installation]) => {
|
|
22
|
+
const registryEntry = getServer(serverId);
|
|
23
|
+
const inRegistry = !!registryEntry;
|
|
24
|
+
const appStatuses = installation.apps.map((appId) => {
|
|
25
|
+
const appScope = installation.scopes?.[appId] ?? "project";
|
|
26
|
+
if (!installedAppIds.has(appId)) {
|
|
27
|
+
return { app: appId, scope: appScope, status: "app-not-detected" };
|
|
28
|
+
}
|
|
29
|
+
const app = appConfigMap.get(appId);
|
|
30
|
+
const resolvedApp = appScope === "global" ? resolveAppForScope(app, "global") : app;
|
|
31
|
+
try {
|
|
32
|
+
const servers = listServersInConfig(resolvedApp.configPath);
|
|
33
|
+
return {
|
|
34
|
+
app: appId,
|
|
35
|
+
scope: appScope,
|
|
36
|
+
status: servers.includes(serverId) ? "present" : "missing",
|
|
37
|
+
};
|
|
38
|
+
}
|
|
39
|
+
catch {
|
|
40
|
+
return { app: appId, scope: appScope, status: "unreadable" };
|
|
41
|
+
}
|
|
42
|
+
});
|
|
43
|
+
return {
|
|
44
|
+
serverId,
|
|
45
|
+
name: registryEntry?.name ?? serverId,
|
|
46
|
+
inRegistry,
|
|
47
|
+
installedAt: installation.installedAt,
|
|
48
|
+
apps: appStatuses,
|
|
49
|
+
};
|
|
50
|
+
});
|
|
51
|
+
console.log(JSON.stringify(results, null, 2));
|
|
52
|
+
return;
|
|
53
|
+
}
|
|
54
|
+
p.intro("getmcp check");
|
|
18
55
|
if (entries.length === 0) {
|
|
19
56
|
p.log.info("No tracked installations. Use 'getmcp add' to install servers.");
|
|
20
57
|
p.outro("Done");
|
|
21
58
|
return;
|
|
22
59
|
}
|
|
23
|
-
const installedApps = detectInstalledApps();
|
|
24
|
-
const installedAppIds = new Set(installedApps.map((a) => a.id));
|
|
25
|
-
const appConfigMap = new Map(installedApps.map((a) => [a.id, a]));
|
|
26
60
|
p.log.info(`Tracked installations: ${entries.length}`);
|
|
27
61
|
let issues = 0;
|
|
28
62
|
for (const [serverId, installation] of entries) {
|
|
@@ -43,10 +77,12 @@ export async function checkCommand() {
|
|
|
43
77
|
continue;
|
|
44
78
|
}
|
|
45
79
|
const app = appConfigMap.get(appId);
|
|
80
|
+
const appScope = installation.scopes?.[appId] ?? "project";
|
|
81
|
+
const resolvedApp = appScope === "global" ? resolveAppForScope(app, "global") : app;
|
|
46
82
|
try {
|
|
47
|
-
const servers = listServersInConfig(
|
|
83
|
+
const servers = listServersInConfig(resolvedApp.configPath);
|
|
48
84
|
if (servers.includes(serverId)) {
|
|
49
|
-
presentIn.push(`${app.name} (${shortenPath(
|
|
85
|
+
presentIn.push(`${app.name} (${shortenPath(resolvedApp.configPath)})`);
|
|
50
86
|
}
|
|
51
87
|
else {
|
|
52
88
|
missingFrom.push(`${app.name} (removed from config)`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"check.js","sourceRoot":"","sources":["../../src/commands/check.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,CAAC,MAAM,gBAAgB,CAAC;AACpC,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAC/C,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"check.js","sourceRoot":"","sources":["../../src/commands/check.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* `getmcp doctor` command.
|
|
3
|
+
*
|
|
4
|
+
* Runs health diagnostics on MCP server configurations:
|
|
5
|
+
* 1. Detect installed apps and report status
|
|
6
|
+
* 2. Parse each app's config file (detect syntax errors)
|
|
7
|
+
* 3. Check if configured servers are in the registry
|
|
8
|
+
* 4. Check for orphaned servers (in config but not in lock)
|
|
9
|
+
* 5. Verify required env vars are set
|
|
10
|
+
* 6. Check for duplicate server entries across apps
|
|
11
|
+
* 7. Verify runtime dependencies (node, npx, uvx)
|
|
12
|
+
*/
|
|
13
|
+
export interface DoctorOptions {
|
|
14
|
+
json?: boolean;
|
|
15
|
+
}
|
|
16
|
+
export declare function doctorCommand(options?: DoctorOptions): Promise<void>;
|
|
17
|
+
//# sourceMappingURL=doctor.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"doctor.d.ts","sourceRoot":"","sources":["../../src/commands/doctor.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AASH,MAAM,WAAW,aAAa;IAC5B,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AASD,wBAAsB,aAAa,CAAC,OAAO,GAAE,aAAkB,GAAG,OAAO,CAAC,IAAI,CAAC,CAmJ9E"}
|
|
@@ -0,0 +1,179 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* `getmcp doctor` command.
|
|
3
|
+
*
|
|
4
|
+
* Runs health diagnostics on MCP server configurations:
|
|
5
|
+
* 1. Detect installed apps and report status
|
|
6
|
+
* 2. Parse each app's config file (detect syntax errors)
|
|
7
|
+
* 3. Check if configured servers are in the registry
|
|
8
|
+
* 4. Check for orphaned servers (in config but not in lock)
|
|
9
|
+
* 5. Verify required env vars are set
|
|
10
|
+
* 6. Check for duplicate server entries across apps
|
|
11
|
+
* 7. Verify runtime dependencies (node, npx, uvx)
|
|
12
|
+
*/
|
|
13
|
+
import * as p from "@clack/prompts";
|
|
14
|
+
import { execSync } from "node:child_process";
|
|
15
|
+
import { getServer } from "@getmcp/registry";
|
|
16
|
+
import { detectInstalledApps } from "../detect.js";
|
|
17
|
+
import { readConfigFile, listServersInConfig } from "../config-file.js";
|
|
18
|
+
import { getTrackedServers } from "../lock.js";
|
|
19
|
+
export async function doctorCommand(options = {}) {
|
|
20
|
+
const results = [];
|
|
21
|
+
// 1. Detect apps
|
|
22
|
+
const apps = detectInstalledApps();
|
|
23
|
+
results.push({
|
|
24
|
+
category: "apps",
|
|
25
|
+
status: apps.length > 0 ? "ok" : "warn",
|
|
26
|
+
message: apps.length > 0
|
|
27
|
+
? `${apps.length} AI application(s) detected`
|
|
28
|
+
: "No AI applications detected on this system",
|
|
29
|
+
details: apps.map((a) => a.name).join(", ") || undefined,
|
|
30
|
+
});
|
|
31
|
+
// 2. Parse config files
|
|
32
|
+
for (const app of apps) {
|
|
33
|
+
try {
|
|
34
|
+
readConfigFile(app.configPath);
|
|
35
|
+
results.push({
|
|
36
|
+
category: "config-parse",
|
|
37
|
+
status: "ok",
|
|
38
|
+
message: `${app.name}: config file is valid`,
|
|
39
|
+
});
|
|
40
|
+
}
|
|
41
|
+
catch (err) {
|
|
42
|
+
results.push({
|
|
43
|
+
category: "config-parse",
|
|
44
|
+
status: "error",
|
|
45
|
+
message: `${app.name}: config file has syntax errors`,
|
|
46
|
+
details: err instanceof Error ? err.message : String(err),
|
|
47
|
+
});
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
// 3-6. Check servers in configs
|
|
51
|
+
const allConfiguredServers = new Map();
|
|
52
|
+
for (const app of apps) {
|
|
53
|
+
let servers = [];
|
|
54
|
+
try {
|
|
55
|
+
servers = listServersInConfig(app.configPath);
|
|
56
|
+
}
|
|
57
|
+
catch {
|
|
58
|
+
continue;
|
|
59
|
+
}
|
|
60
|
+
for (const serverId of servers) {
|
|
61
|
+
const existing = allConfiguredServers.get(serverId) ?? [];
|
|
62
|
+
existing.push(app.id);
|
|
63
|
+
allConfiguredServers.set(serverId, existing);
|
|
64
|
+
}
|
|
65
|
+
}
|
|
66
|
+
// Check registry status of configured servers
|
|
67
|
+
const lock = getTrackedServers();
|
|
68
|
+
for (const [serverId, appIds] of allConfiguredServers) {
|
|
69
|
+
const registryEntry = getServer(serverId);
|
|
70
|
+
const isTracked = serverId in lock.installations;
|
|
71
|
+
if (!registryEntry && !isTracked) {
|
|
72
|
+
results.push({
|
|
73
|
+
category: "server-status",
|
|
74
|
+
status: "warn",
|
|
75
|
+
message: `"${serverId}" is not in the registry and not tracked`,
|
|
76
|
+
details: `Configured in: ${appIds.join(", ")}`,
|
|
77
|
+
});
|
|
78
|
+
}
|
|
79
|
+
else if (!registryEntry && isTracked) {
|
|
80
|
+
results.push({
|
|
81
|
+
category: "server-status",
|
|
82
|
+
status: "warn",
|
|
83
|
+
message: `"${serverId}" is tracked but no longer in registry`,
|
|
84
|
+
details: `Configured in: ${appIds.join(", ")}`,
|
|
85
|
+
});
|
|
86
|
+
}
|
|
87
|
+
// Check for orphaned servers (in config but not in lock)
|
|
88
|
+
if (registryEntry && !isTracked) {
|
|
89
|
+
results.push({
|
|
90
|
+
category: "orphaned",
|
|
91
|
+
status: "warn",
|
|
92
|
+
message: `"${serverId}" is in config but not tracked in lock file`,
|
|
93
|
+
details: `Configured in: ${appIds.join(", ")}. Run 'getmcp add ${serverId}' to track it.`,
|
|
94
|
+
});
|
|
95
|
+
}
|
|
96
|
+
}
|
|
97
|
+
// Check env vars for tracked servers
|
|
98
|
+
for (const [serverId, installation] of Object.entries(lock.installations)) {
|
|
99
|
+
if (installation.envVars.length === 0)
|
|
100
|
+
continue;
|
|
101
|
+
const missingVars = installation.envVars.filter((v) => !process.env[v]);
|
|
102
|
+
if (missingVars.length > 0) {
|
|
103
|
+
results.push({
|
|
104
|
+
category: "env-vars",
|
|
105
|
+
status: "warn",
|
|
106
|
+
message: `"${serverId}" has unset env vars: ${missingVars.join(", ")}`,
|
|
107
|
+
details: "These may be configured in app-specific config files rather than the shell environment.",
|
|
108
|
+
});
|
|
109
|
+
}
|
|
110
|
+
}
|
|
111
|
+
// Check for duplicate server entries (same server in multiple apps)
|
|
112
|
+
for (const [serverId, appIds] of allConfiguredServers) {
|
|
113
|
+
if (appIds.length > 1) {
|
|
114
|
+
results.push({
|
|
115
|
+
category: "duplicates",
|
|
116
|
+
status: "ok",
|
|
117
|
+
message: `"${serverId}" is configured in ${appIds.length} apps`,
|
|
118
|
+
details: appIds.join(", "),
|
|
119
|
+
});
|
|
120
|
+
}
|
|
121
|
+
}
|
|
122
|
+
// 7. Check runtime dependencies
|
|
123
|
+
checkRuntime("node", "--version", results);
|
|
124
|
+
checkRuntime("npx", "--version", results);
|
|
125
|
+
checkRuntime("uvx", "--version", results);
|
|
126
|
+
// Output
|
|
127
|
+
if (options.json) {
|
|
128
|
+
console.log(JSON.stringify(results, null, 2));
|
|
129
|
+
return;
|
|
130
|
+
}
|
|
131
|
+
p.intro("getmcp doctor");
|
|
132
|
+
const errors = results.filter((r) => r.status === "error");
|
|
133
|
+
const warnings = results.filter((r) => r.status === "warn");
|
|
134
|
+
const oks = results.filter((r) => r.status === "ok");
|
|
135
|
+
for (const r of errors) {
|
|
136
|
+
p.log.error(`${r.message}${r.details ? `\n ${r.details}` : ""}`);
|
|
137
|
+
}
|
|
138
|
+
for (const r of warnings) {
|
|
139
|
+
p.log.warn(`${r.message}${r.details ? `\n ${r.details}` : ""}`);
|
|
140
|
+
}
|
|
141
|
+
for (const r of oks) {
|
|
142
|
+
p.log.success(r.message);
|
|
143
|
+
}
|
|
144
|
+
if (errors.length > 0) {
|
|
145
|
+
p.outro(`${errors.length} error(s) and ${warnings.length} warning(s) found.`);
|
|
146
|
+
}
|
|
147
|
+
else if (warnings.length > 0) {
|
|
148
|
+
p.outro(`${warnings.length} warning(s) found. ${oks.length} check(s) passed.`);
|
|
149
|
+
}
|
|
150
|
+
else {
|
|
151
|
+
p.outro(`All ${oks.length} check(s) passed.`);
|
|
152
|
+
}
|
|
153
|
+
}
|
|
154
|
+
function checkRuntime(command, versionFlag, results) {
|
|
155
|
+
try {
|
|
156
|
+
const version = execSync(`${command} ${versionFlag}`, {
|
|
157
|
+
timeout: 5000,
|
|
158
|
+
stdio: ["pipe", "pipe", "pipe"],
|
|
159
|
+
})
|
|
160
|
+
.toString()
|
|
161
|
+
.trim();
|
|
162
|
+
results.push({
|
|
163
|
+
category: "runtime",
|
|
164
|
+
status: "ok",
|
|
165
|
+
message: `${command}: ${version}`,
|
|
166
|
+
});
|
|
167
|
+
}
|
|
168
|
+
catch {
|
|
169
|
+
results.push({
|
|
170
|
+
category: "runtime",
|
|
171
|
+
status: command === "uvx" ? "warn" : "warn",
|
|
172
|
+
message: `${command}: not found`,
|
|
173
|
+
details: command === "uvx"
|
|
174
|
+
? "Python-based MCP servers require uvx. Install with: pip install uv"
|
|
175
|
+
: `${command} is required for stdio MCP servers`,
|
|
176
|
+
});
|
|
177
|
+
}
|
|
178
|
+
}
|
|
179
|
+
//# sourceMappingURL=doctor.js.map
|