@1mcp/agent 0.31.0-beta1 â 0.31.0-beta3
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/build/commands/cliSetup/setupFiles.d.ts.map +1 -1
- package/build/commands/cliSetup/setupFiles.js +8 -1
- package/build/commands/cliSetup/setupFiles.js.map +1 -1
- package/build/commands/mcp/add.d.ts.map +1 -1
- package/build/commands/mcp/add.js +21 -2
- package/build/commands/mcp/add.js.map +1 -1
- package/build/commands/mcp/index.d.ts.map +1 -1
- package/build/commands/mcp/index.js +5 -4
- package/build/commands/mcp/index.js.map +1 -1
- package/build/commands/mcp/list.d.ts.map +1 -1
- package/build/commands/mcp/list.js +52 -8
- package/build/commands/mcp/list.js.map +1 -1
- package/build/commands/mcp/status.d.ts.map +1 -1
- package/build/commands/mcp/status.js +59 -26
- package/build/commands/mcp/status.js.map +1 -1
- package/build/commands/serve/index.d.ts +0 -22
- package/build/commands/serve/index.d.ts.map +1 -1
- package/build/commands/serve/index.js +0 -23
- package/build/commands/serve/index.js.map +1 -1
- package/build/commands/serve/serve.d.ts +23 -23
- package/build/commands/serve/serve.d.ts.map +1 -1
- package/build/commands/serve/serve.js +67 -51
- package/build/commands/serve/serve.js.map +1 -1
- package/build/commands/shared/baseConfigUtils.d.ts +15 -1
- package/build/commands/shared/baseConfigUtils.d.ts.map +1 -1
- package/build/commands/shared/baseConfigUtils.js +146 -41
- package/build/commands/shared/baseConfigUtils.js.map +1 -1
- package/build/config/configLoader.d.ts +28 -2
- package/build/config/configLoader.d.ts.map +1 -1
- package/build/config/configLoader.js +155 -28
- package/build/config/configLoader.js.map +1 -1
- package/build/config/configManager.d.ts +2 -1
- package/build/config/configManager.d.ts.map +1 -1
- package/build/config/configManager.js +20 -4
- package/build/config/configManager.js.map +1 -1
- package/build/config/mcpConfigManager.d.ts +18 -5
- package/build/config/mcpConfigManager.d.ts.map +1 -1
- package/build/config/mcpConfigManager.js +51 -44
- package/build/config/mcpConfigManager.js.map +1 -1
- package/build/config/mcpConfigMerge.d.ts +15 -0
- package/build/config/mcpConfigMerge.d.ts.map +1 -0
- package/build/config/mcpConfigMerge.js +87 -0
- package/build/config/mcpConfigMerge.js.map +1 -0
- package/build/constants/mcp.d.ts +2 -1
- package/build/constants/mcp.d.ts.map +1 -1
- package/build/constants/mcp.js +2 -1
- package/build/constants/mcp.js.map +1 -1
- package/build/constants/paths.d.ts +5 -0
- package/build/constants/paths.d.ts.map +1 -1
- package/build/constants/paths.js +9 -1
- package/build/constants/paths.js.map +1 -1
- package/build/core/tools/handlers/serverManagementHandler.d.ts +5 -0
- package/build/core/tools/handlers/serverManagementHandler.d.ts.map +1 -1
- package/build/core/tools/internal/adapters/helpers/configTransformers.d.ts +1 -0
- package/build/core/tools/internal/adapters/helpers/configTransformers.d.ts.map +1 -1
- package/build/core/types/transport.d.ts +146 -0
- package/build/core/types/transport.d.ts.map +1 -1
- package/build/core/types/transport.js +75 -0
- package/build/core/types/transport.js.map +1 -1
- package/build/index.d.ts +2 -0
- package/build/index.d.ts.map +1 -1
- package/build/index.js +4 -3
- package/build/index.js.map +1 -1
- package/build/utils/cli/normalizedArgv.d.ts +3 -0
- package/build/utils/cli/normalizedArgv.d.ts.map +1 -0
- package/build/utils/cli/normalizedArgv.js +9 -0
- package/build/utils/cli/normalizedArgv.js.map +1 -0
- package/build/utils/validation/urlDetection.d.ts.map +1 -1
- package/build/utils/validation/urlDetection.js +2 -1
- package/build/utils/validation/urlDetection.js.map +1 -1
- package/package.json +5 -4
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setupFiles.d.ts","sourceRoot":"","sources":["../../../src/commands/cliSetup/setupFiles.ts"],"names":[],"mappings":"AAQA,eAAO,MAAM,iBAAiB,8BAA+B,CAAC;AAC9D,MAAM,MAAM,cAAc,GAAG,CAAC,OAAO,iBAAiB,CAAC,CAAC,MAAM,CAAC,CAAC;AAEhE,eAAO,MAAM,gBAAgB,oCAAqC,CAAC;AACnE,MAAM,MAAM,aAAa,GAAG,CAAC,OAAO,gBAAgB,CAAC,CAAC,MAAM,CAAC,CAAC;AAkB9D,UAAU,oBAAoB;IAC5B,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,aAAa,CAAC;IACrB,OAAO,EAAE,cAAc,EAAE,CAAC;CAC3B;AAED,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,EAAE,MAAM,GAAG,aAAa,GAAG,aAAa,CAAC;IAC7C,MAAM,EAAE,cAAc,CAAC;IACvB,KAAK,EAAE,OAAO,CAAC,aAAa,EAAE,KAAK,CAAC,CAAC;CACtC;AAsBD,wBAAgB,oBAAoB,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,aAAa,CAWrE;AAED,wBAAsB,kBAAkB,CAAC,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAAC,mBAAmB,EAAE,CAAC,CAiBtG;AAsBD,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,mBAAmB,EAAE,GAAG,MAAM,CAO3E;AAED,wBAAgB,uBAAuB,IAAI,MAAM,CAkBhD;AAED,wBAAgB,4BAA4B,CAAC,cAAc,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,MAAM,
|
|
1
|
+
{"version":3,"file":"setupFiles.d.ts","sourceRoot":"","sources":["../../../src/commands/cliSetup/setupFiles.ts"],"names":[],"mappings":"AAQA,eAAO,MAAM,iBAAiB,8BAA+B,CAAC;AAC9D,MAAM,MAAM,cAAc,GAAG,CAAC,OAAO,iBAAiB,CAAC,CAAC,MAAM,CAAC,CAAC;AAEhE,eAAO,MAAM,gBAAgB,oCAAqC,CAAC;AACnE,MAAM,MAAM,aAAa,GAAG,CAAC,OAAO,gBAAgB,CAAC,CAAC,MAAM,CAAC,CAAC;AAkB9D,UAAU,oBAAoB;IAC5B,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,aAAa,CAAC;IACrB,OAAO,EAAE,cAAc,EAAE,CAAC;CAC3B;AAED,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,EAAE,MAAM,GAAG,aAAa,GAAG,aAAa,CAAC;IAC7C,MAAM,EAAE,cAAc,CAAC;IACvB,KAAK,EAAE,OAAO,CAAC,aAAa,EAAE,KAAK,CAAC,CAAC;CACtC;AAsBD,wBAAgB,oBAAoB,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,aAAa,CAWrE;AAED,wBAAsB,kBAAkB,CAAC,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAAC,mBAAmB,EAAE,CAAC,CAiBtG;AAsBD,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,mBAAmB,EAAE,GAAG,MAAM,CAO3E;AAED,wBAAgB,uBAAuB,IAAI,MAAM,CAkBhD;AAED,wBAAgB,4BAA4B,CAAC,cAAc,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,GAAG,MAAM,CAOnG;AAED,wBAAgB,4BAA4B,CAAC,eAAe,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,MAAM,CAqBlG"}
|
|
@@ -65,16 +65,23 @@ export function renderManagedDocContent() {
|
|
|
65
65
|
].join('\n');
|
|
66
66
|
}
|
|
67
67
|
export function renderStartupDocManagedBlock(startupDocPath, managedDocPath) {
|
|
68
|
+
if (path.basename(startupDocPath) === 'AGENTS.md' && path.dirname(startupDocPath) === path.dirname(managedDocPath)) {
|
|
69
|
+
return `@${managedDocPath.replace(/\\/g, '/')}\n`;
|
|
70
|
+
}
|
|
68
71
|
const relativePath = path.relative(path.dirname(startupDocPath), managedDocPath).replace(/\\/g, '/');
|
|
69
72
|
return `@${relativePath}\n`;
|
|
70
73
|
}
|
|
71
74
|
export function upsertStartupDocManagedBlock(existingContent, managedBlock) {
|
|
72
75
|
const normalizedExisting = existingContent.replace(/\r\n/g, '\n');
|
|
73
76
|
const referenceLine = managedBlock.trim();
|
|
77
|
+
const managedReferenceAliases = new Set([referenceLine]);
|
|
78
|
+
if (referenceLine.startsWith('@/') && referenceLine.endsWith('/1MCP.md')) {
|
|
79
|
+
managedReferenceAliases.add('@1MCP.md');
|
|
80
|
+
}
|
|
74
81
|
const withoutLegacyBlocks = normalizedExisting.replace(LEGACY_MANAGED_BLOCK_PATTERN, '');
|
|
75
82
|
const remainingLines = withoutLegacyBlocks
|
|
76
83
|
.split('\n')
|
|
77
|
-
.filter((line) => line.trim()
|
|
84
|
+
.filter((line) => !managedReferenceAliases.has(line.trim()))
|
|
78
85
|
.join('\n')
|
|
79
86
|
.trimEnd();
|
|
80
87
|
if (remainingLines.length === 0) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setupFiles.js","sourceRoot":"","sources":["../../../src/commands/cliSetup/setupFiles.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"setupFiles.js","sourceRoot":"","sources":["../../../src/commands/cliSetup/setupFiles.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC9D,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,MAAM,MAAM,uBAAuB,CAAC;AAE3C,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,OAAO,EAAE,QAAQ,CAAU,CAAC;AAG9D,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,CAAU,CAAC;AAGnE,MAAM,4BAA4B,GAChC,6FAA6F,CAAC;AAEhG,MAAM,eAAe,GAAG,mBAAmB,CAAC;AA+C5C,MAAM,UAAU,oBAAoB,CAAC,QAAiB;IACpD,IAAI,CAAC,QAAQ,IAAI,QAAQ,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC;QACxC,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,MAAM,eAAe,GAAG,QAAQ,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;IACtD,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,eAAgC,CAAC,EAAE,CAAC;QACjE,MAAM,IAAI,KAAK,CAAC,4BAA4B,QAAQ,sBAAsB,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC3G,CAAC;IAED,OAAO,eAAgC,CAAC;AAC1C,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAAC,OAA6B;IACpE,MAAM,iBAAiB,GAAG,uBAAuB,EAAE,CAAC;IACpD,MAAM,MAAM,GAAG,aAAa,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE,CACnF,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;QACnC,MAAM,OAAO,GAAG,MAAM,KAAK,OAAO,CAAC;QACnC,MAAM,cAAc,GAAG,OAAO,CAAC,CAAC,CAAC,UAAU,CAAC,mBAAmB,CAAC,CAAC,CAAC,UAAU,CAAC,oBAAoB,CAAC;QAClG,MAAM,QAAQ,GAAG,OAAO,CAAC,CAAC,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC,CAAC,UAAU,CAAC,cAAc,CAAC;QAChF,MAAM,WAAW,GAAG,OAAO,CAAC,CAAC,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC,CAAC,UAAU,CAAC,iBAAiB,CAAC;QAEzF,OAAO,qBAAqB,CAAC,cAAc,EAAE,QAAQ,EAAE,WAAW,EAAE,iBAAiB,EAAE;YACrF,MAAM;YACN,KAAK,EAAE,UAAU,CAAC,KAAK;SACxB,CAAC,CAAC;IACL,CAAC,CAAC,CACH,CAAC;IAEF,OAAO,CAAC,MAAM,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;AAC5C,CAAC;AAED,KAAK,UAAU,qBAAqB,CAClC,cAAsB,EACtB,QAAgB,EAChB,WAAmB,EACnB,iBAAyB,EACzB,UAAyD;IAEzD,MAAM,eAAe,GAAG,MAAM,gBAAgB,CAAC,WAAW,CAAC,CAAC;IAC5D,MAAM,cAAc,GAAG,4BAA4B,CACjD,eAAe,EACf,4BAA4B,CAAC,WAAW,EAAE,cAAc,CAAC,CAC1D,CAAC;IAEF,OAAO,OAAO,CAAC,GAAG,CAAC;QACjB,gBAAgB,CAAC,cAAc,EAAE,iBAAiB,EAAE,EAAE,GAAG,UAAU,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC;QAC3F,gBAAgB,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,WAAW,CAAC,QAAQ,CAAC,EAAE,EAAE,GAAG,UAAU,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;QAChG,gBAAgB,CAAC,WAAW,EAAE,cAAc,EAAE,EAAE,GAAG,UAAU,EAAE,IAAI,EAAE,aAAa,EAAE,EAAE,eAAe,CAAC;KACvG,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,OAA8B;IACjE,MAAM,MAAM,GAAG,+BAA+B,CAAC;IAC/C,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CACvB,CAAC,MAAM,EAAE,EAAE,CACT,MAAM,MAAM,CAAC,KAAK,KAAK,MAAM,CAAC,IAAI,IAAI,MAAM,CAAC,MAAM,KAAK,MAAM,CAAC,IAAI,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,cAAc,EAAE,CAC/G,CAAC;IACF,OAAO,CAAC,MAAM,EAAE,GAAG,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACvC,CAAC;AAED,MAAM,UAAU,uBAAuB;IACrC,OAAO;QACL,wBAAwB;QACxB,EAAE;QACF,0HAA0H;QAC1H,+EAA+E;QAC/E,EAAE;QACF,qJAAqJ;QACrJ,EAAE;QACF,4DAA4D;QAC5D,2EAA2E;QAC3E,yDAAyD;QACzD,kEAAkE;QAClE,0FAA0F;QAC1F,EAAE;QACF,iIAAiI;QACjI,EAAE;KACH,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACf,CAAC;AAED,MAAM,UAAU,4BAA4B,CAAC,cAAsB,EAAE,cAAsB;IACzF,IAAI,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,KAAK,WAAW,IAAI,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,KAAK,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE,CAAC;QACnH,OAAO,IAAI,cAAc,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,IAAI,CAAC;IACpD,CAAC;IAED,MAAM,YAAY,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE,cAAc,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IACrG,OAAO,IAAI,YAAY,IAAI,CAAC;AAC9B,CAAC;AAED,MAAM,UAAU,4BAA4B,CAAC,eAAuB,EAAE,YAAoB;IACxF,MAAM,kBAAkB,GAAG,eAAe,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAClE,MAAM,aAAa,GAAG,YAAY,CAAC,IAAI,EAAE,CAAC;IAC1C,MAAM,uBAAuB,GAAG,IAAI,GAAG,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC;IAEzD,IAAI,aAAa,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,aAAa,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;QACzE,uBAAuB,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IAC1C,CAAC;IAED,MAAM,mBAAmB,GAAG,kBAAkB,CAAC,OAAO,CAAC,4BAA4B,EAAE,EAAE,CAAC,CAAC;IACzF,MAAM,cAAc,GAAG,mBAAmB;SACvC,KAAK,CAAC,IAAI,CAAC;SACX,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,uBAAuB,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;SAC3D,IAAI,CAAC,IAAI,CAAC;SACV,OAAO,EAAE,CAAC;IAEb,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAChC,OAAO,GAAG,aAAa,IAAI,CAAC;IAC9B,CAAC;IAED,OAAO,GAAG,cAAc,KAAK,aAAa,IAAI,CAAC;AACjD,CAAC;AAED,SAAS,aAAa,CAAC,QAAgB,EAAE,KAAoB;IAC3D,MAAM,MAAM,GAAG,KAAK,KAAK,KAAK,CAAC,CAAC,CAAE,CAAC,QAAQ,EAAE,MAAM,CAAW,CAAC,CAAC,CAAE,CAAC,KAAK,CAAW,CAAC;IAEpF,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,YAAY,EAAE,EAAE;QACjC,IAAI,YAAY,KAAK,QAAQ,EAAE,CAAC;YAC9B,MAAM,OAAO,GAAG,EAAE,CAAC,OAAO,EAAE,CAAC;YAC7B,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;YAC/C,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;YAEjD,OAAO;gBACL,KAAK,EAAE,YAAY;gBACnB,OAAO,EAAE,OAAO;gBAChB,mBAAmB,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,SAAS,CAAC;gBACpD,oBAAoB,EAAE,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,SAAS,CAAC;gBACtD,aAAa,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,YAAY,CAAC;gBACjD,cAAc,EAAE,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,eAAe,CAAC;gBACtD,gBAAgB,EAAE,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,WAAW,CAAC;gBACnD,iBAAiB,EAAE,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,WAAW,CAAC;aACtD,CAAC;QACJ,CAAC;QAED,MAAM,gBAAgB,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QAChD,OAAO;YACL,KAAK,EAAE,YAAY;YACnB,OAAO,EAAE,gBAAgB;YACzB,mBAAmB,EAAE,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,QAAQ,EAAE,SAAS,CAAC;YACrE,oBAAoB,EAAE,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,SAAS,EAAE,SAAS,CAAC;YACvE,aAAa,EAAE,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,QAAQ,EAAE,YAAY,CAAC;YAClE,cAAc,EAAE,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,SAAS,EAAE,eAAe,CAAC;YACvE,gBAAgB,EAAE,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,WAAW,CAAC;YAC1D,iBAAiB,EAAE,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,WAAW,CAAC;SAC5D,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC;AAED,KAAK,UAAU,gBAAgB,CAC7B,QAAgB,EAChB,OAAuE,EACvE,UAAyD;IAEzD,MAAM,eAAe,GAAG,MAAM,gBAAgB,CAAC,QAAQ,CAAC,CAAC;IACzD,MAAM,MAAM,GAAG,eAAe,CAAC,eAAe,CAAC,CAAC;IAChD,IAAI,eAAe,CAAC,eAAe,CAAC,EAAE,CAAC;QACrC,MAAM,CAAC,IAAI,CAAC,+BAA+B,QAAQ,2CAA2C,CAAC,CAAC;QAChG,OAAO;YACL,GAAG,UAAU;YACb,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE,KAAK;SACf,CAAC;IACJ,CAAC;IAED,MAAM,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAChC,MAAM,WAAW,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC;IAC5D,MAAM,OAAO,GAAG,WAAW,KAAK,aAAa,CAAC,eAAe,CAAC,CAAC;IAE/D,IAAI,OAAO,EAAE,CAAC;QACZ,MAAM,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QACzD,MAAM,SAAS,CAAC,QAAQ,EAAE,WAAW,EAAE,MAAM,CAAC,CAAC;IACjD,CAAC;IAED,OAAO;QACL,GAAG,UAAU;QACb,IAAI,EAAE,QAAQ;QACd,OAAO;KACR,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,gBAAgB,CAC7B,QAAgB,EAChB,WAAmB,EACnB,UAAyD,EACzD,eAAwB;IAExB,MAAM,QAAQ,GAAG,eAAe,IAAI,CAAC,MAAM,gBAAgB,CAAC,QAAQ,CAAC,CAAC,CAAC;IACvE,MAAM,qBAAqB,GAAG,aAAa,CAAC,WAAW,CAAC,CAAC;IACzD,MAAM,OAAO,GAAG,qBAAqB,KAAK,aAAa,CAAC,QAAQ,CAAC,CAAC;IAElE,IAAI,OAAO,EAAE,CAAC;QACZ,MAAM,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QACzD,MAAM,SAAS,CAAC,QAAQ,EAAE,qBAAqB,EAAE,MAAM,CAAC,CAAC;IAC3D,CAAC;IAED,OAAO;QACL,GAAG,UAAU;QACb,IAAI,EAAE,QAAQ;QACd,OAAO;KACR,CAAC;AACJ,CAAC;AAED,SAAS,WAAW,CAAC,QAAiC;IACpD,MAAM,MAAM,GAAG,eAAe,CAAC,QAAQ,CAAC,CAAC;IACzC,MAAM,CAAC,KAAK,KAAK,EAAE,CAAC;IACpB,MAAM,CAAC,KAAK,CAAC,YAAY,GAAG,uBAAuB,CAAC,MAAM,CAAC,KAAK,CAAC,YAAY,IAAI,EAAE,CAAC,CAAC;IACrF,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,uBAAuB,CAAC,OAAoB;IACnD,MAAM,cAAc,GAAgB,EAAE,CAAC;IACvC,IAAI,eAAe,GAAG,KAAK,CAAC;IAE5B,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;QAC5B,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;QAC7D,MAAM,SAAS,GAAkB,EAAE,CAAC;QAEpC,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACzB,IAAI,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC;gBACxB,IAAI,CAAC,eAAe,EAAE,CAAC;oBACrB,eAAe,GAAG,IAAI,CAAC;oBACvB,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACvB,CAAC;gBACD,SAAS;YACX,CAAC;YACD,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACvB,CAAC;QAED,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACzB,cAAc,CAAC,IAAI,CAAC;gBAClB,GAAG,KAAK;gBACR,KAAK,EAAE,SAAS;aACjB,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,IAAI,CAAC,eAAe,EAAE,CAAC;QACrB,cAAc,CAAC,IAAI,CAAC,eAAe,EAAE,CAAC,CAAC;IACzC,CAAC;IAED,OAAO,cAAc,CAAC;AACxB,CAAC;AAED,SAAS,eAAe;IACtB,OAAO;QACL,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,eAAe,EAAE,CAAC;KACvD,CAAC;AACJ,CAAC;AAED,SAAS,aAAa,CAAC,IAA6B;IAClD,OAAO,IAAI,EAAE,IAAI,KAAK,SAAS,IAAI,IAAI,CAAC,OAAO,KAAK,eAAe,CAAC;AACtE,CAAC;AAED,SAAS,eAAe,CAAC,QAAiC;IACxD,IAAI,OAAO,eAAe,KAAK,UAAU,EAAE,CAAC;QAC1C,OAAO,eAAe,CAAC,QAAQ,IAAI,EAAE,CAAe,CAAC;IACvD,CAAC;IAED,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAe,CAAC;AAClE,CAAC;AAED,SAAS,eAAe,CAAC,OAAe;IACtC,OAAO,qBAAqB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;AAC7C,CAAC;AAED,SAAS,eAAe,CAAC,OAAe;IACtC,IAAI,OAAO,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC;QAC1B,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,MAAM,MAAM,GAAG,KAAK,CAAC,KAAK,CAAC,OAAO,CAAY,CAAC;IAC/C,IAAI,CAAC,MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;QACnE,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;IAClE,CAAC;IAED,OAAO,MAAiC,CAAC;AAC3C,CAAC;AAED,KAAK,UAAU,gBAAgB,CAAC,QAAgB;IAC9C,IAAI,CAAC;QACH,OAAO,MAAM,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IAC1C,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,kBAAkB,CAAC,KAAK,CAAC,EAAE,CAAC;YAC9B,OAAO,EAAE,CAAC;QACZ,CAAC;QACD,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC;AAED,SAAS,aAAa,CAAC,KAAa;IAClC,MAAM,UAAU,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAChD,OAAO,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,UAAU,IAAI,CAAC;AACpE,CAAC;AAED,SAAS,kBAAkB,CAAC,KAAc;IACxC,OAAO,KAAK,KAAK,IAAI,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,MAAM,IAAI,KAAK,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ,CAAC;AACnG,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add.d.ts","sourceRoot":"","sources":["../../../src/commands/mcp/add.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAGtD,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"add.d.ts","sourceRoot":"","sources":["../../../src/commands/mcp/add.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAGtD,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC;AAuBlC,MAAM,WAAW,cAAe,SAAQ,aAAa;IACnD,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,EAAE,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,IAAI;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkF1C;AAED;;GAEG;AACH,wBAAsB,UAAU,CAAC,IAAI,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAgMpE"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import printer from '../../utils/ui/printer.js';
|
|
2
|
-
import { backupConfig, initializeConfigContext, parseEnvVars, parseHeaders, parseTags, reloadMcpConfig, serverExists, setServer, validateConfigPath, } from './utils/mcpServerConfig.js';
|
|
2
|
+
import { backupConfig, getGlobalConfig, initializeConfigContext, parseEnvVars, parseHeaders, parseTags, reloadMcpConfig, serverExists, setServer, validateConfigPath, } from './utils/mcpServerConfig.js';
|
|
3
3
|
import { validateEnvVars, validateHeaders, validateServerArgs, validateServerName, validateTags, validateTimeout, } from './utils/validation.js';
|
|
4
4
|
/**
|
|
5
5
|
* Build the add command configuration
|
|
@@ -43,7 +43,7 @@ export function buildAddCommand(yargs) {
|
|
|
43
43
|
alias: 'g',
|
|
44
44
|
})
|
|
45
45
|
.option('timeout', {
|
|
46
|
-
describe: 'Connection timeout in milliseconds',
|
|
46
|
+
describe: 'Connection timeout in milliseconds (inherits from global default when omitted)',
|
|
47
47
|
type: 'number',
|
|
48
48
|
})
|
|
49
49
|
.option('disabled', {
|
|
@@ -242,6 +242,25 @@ export async function addCommand(argv) {
|
|
|
242
242
|
if (backupPath) {
|
|
243
243
|
printer.keyValue({ 'Backup created': backupPath });
|
|
244
244
|
}
|
|
245
|
+
const globalConfig = getGlobalConfig();
|
|
246
|
+
const inheritedKeys = [];
|
|
247
|
+
if (argv.timeout === undefined && globalConfig.timeout !== undefined)
|
|
248
|
+
inheritedKeys.push('timeout');
|
|
249
|
+
if (globalConfig.connectionTimeout !== undefined)
|
|
250
|
+
inheritedKeys.push('connectionTimeout');
|
|
251
|
+
if (globalConfig.requestTimeout !== undefined)
|
|
252
|
+
inheritedKeys.push('requestTimeout');
|
|
253
|
+
if (argv.env === undefined && globalConfig.env !== undefined)
|
|
254
|
+
inheritedKeys.push('env');
|
|
255
|
+
if (type === 'stdio' && globalConfig.inheritParentEnv !== undefined)
|
|
256
|
+
inheritedKeys.push('inheritParentEnv');
|
|
257
|
+
if (type !== 'stdio' && argv.headers === undefined && globalConfig.headers !== undefined)
|
|
258
|
+
inheritedKeys.push('headers');
|
|
259
|
+
if (globalConfig.oauth !== undefined)
|
|
260
|
+
inheritedKeys.push('oauth');
|
|
261
|
+
if (inheritedKeys.length > 0) {
|
|
262
|
+
printer.keyValue({ Inherits: inheritedKeys.join(', ') });
|
|
263
|
+
}
|
|
245
264
|
printer.blank();
|
|
246
265
|
printer.info('Server added to configuration. If 1mcp is running, the new server will be loaded automatically.');
|
|
247
266
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add.js","sourceRoot":"","sources":["../../../src/commands/mcp/add.ts"],"names":[],"mappings":"AAEA,OAAO,OAAO,MAAM,0BAA0B,CAAC;AAI/C,OAAO,EACL,YAAY,EACZ,uBAAuB,EACvB,YAAY,EACZ,YAAY,EACZ,SAAS,EACT,eAAe,EACf,YAAY,EACZ,SAAS,EACT,kBAAkB,GACnB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EACL,eAAe,EACf,eAAe,EACf,kBAAkB,EAClB,kBAAkB,EAClB,YAAY,EACZ,eAAe,GAChB,MAAM,uBAAuB,CAAC;AAmB/B;;GAEG;AACH,MAAM,UAAU,eAAe,CAAC,KAAW;IACzC,OAAO,KAAK;SACT,UAAU,CAAC,MAAM,EAAE;QAClB,QAAQ,EAAE,wBAAwB;QAClC,IAAI,EAAE,QAAQ;QACd,YAAY,EAAE,IAAI;KACnB,CAAC;SACD,MAAM,CAAC,MAAM,EAAE;QACd,QAAQ,EAAE,yEAAyE;QACnF,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,CAAC;QACjC,YAAY,EAAE,KAAK;KACpB,CAAC;SACD,MAAM,CAAC,SAAS,EAAE;QACjB,QAAQ,EAAE,yCAAyC;QACnD,IAAI,EAAE,QAAQ;KACf,CAAC;SACD,MAAM,CAAC,MAAM,EAAE;QACd,QAAQ,EAAE,wCAAwC;QAClD,IAAI,EAAE,OAAO;QACb,MAAM,EAAE,IAAI;KACb,CAAC;SACD,MAAM,CAAC,KAAK,EAAE;QACb,QAAQ,EAAE,0BAA0B;QACpC,IAAI,EAAE,QAAQ;QACd,KAAK,EAAE,GAAG;KACX,CAAC;SACD,MAAM,CAAC,KAAK,EAAE;QACb,QAAQ,EAAE,2CAA2C;QACrD,IAAI,EAAE,OAAO;QACb,MAAM,EAAE,IAAI;QACZ,KAAK,EAAE,GAAG;KACX,CAAC;SACD,MAAM,CAAC,MAAM,EAAE;QACd,QAAQ,EAAE,2CAA2C;QACrD,IAAI,EAAE,QAAQ;QACd,KAAK,EAAE,GAAG;KACX,CAAC;SACD,MAAM,CAAC,SAAS,EAAE;QACjB,QAAQ,EAAE,
|
|
1
|
+
{"version":3,"file":"add.js","sourceRoot":"","sources":["../../../src/commands/mcp/add.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/commands/mcp/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/commands/mcp/index.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC;AAYlC;;;;;GAKG;AAEH;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,IAAI,GAAG,IAAI,CAyLlD"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
// Import builder functions from command implementations
|
|
2
2
|
import { globalOptions } from '../../globalOptions.js';
|
|
3
|
+
import { normalizedArgv } from '../../utils/cli/normalizedArgv.js';
|
|
3
4
|
import printer from '../../utils/ui/printer.js';
|
|
4
5
|
import { buildAddCommand } from './add.js';
|
|
5
6
|
import { buildDisableCommand, buildEnableCommand } from './enable.js';
|
|
@@ -31,8 +32,8 @@ export function setupMcpCommands(yargs) {
|
|
|
31
32
|
const { addCommand } = await import('./add.js');
|
|
32
33
|
const { parseDoubleHyphenArgs, hasDoubleHyphen, mergeDoubleHyphenArgs } = await import('./utils/doubleHyphenParser.js');
|
|
33
34
|
// Check if " -- " pattern is used
|
|
34
|
-
if (hasDoubleHyphen(
|
|
35
|
-
const doubleHyphenResult = parseDoubleHyphenArgs(
|
|
35
|
+
if (hasDoubleHyphen(normalizedArgv)) {
|
|
36
|
+
const doubleHyphenResult = parseDoubleHyphenArgs(normalizedArgv);
|
|
36
37
|
const mergedArgv = mergeDoubleHyphenArgs(argv, doubleHyphenResult);
|
|
37
38
|
await addCommand(mergedArgv);
|
|
38
39
|
}
|
|
@@ -76,8 +77,8 @@ export function setupMcpCommands(yargs) {
|
|
|
76
77
|
const { updateCommand } = await import('./update.js');
|
|
77
78
|
const { parseDoubleHyphenArgs, hasDoubleHyphen, mergeDoubleHyphenArgs } = await import('./utils/doubleHyphenParser.js');
|
|
78
79
|
// Check if " -- " pattern is used
|
|
79
|
-
if (hasDoubleHyphen(
|
|
80
|
-
const doubleHyphenResult = parseDoubleHyphenArgs(
|
|
80
|
+
if (hasDoubleHyphen(normalizedArgv)) {
|
|
81
|
+
const doubleHyphenResult = parseDoubleHyphenArgs(normalizedArgv);
|
|
81
82
|
const mergedArgv = mergeDoubleHyphenArgs(argv, doubleHyphenResult);
|
|
82
83
|
await updateCommand(mergedArgv);
|
|
83
84
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/mcp/index.ts"],"names":[],"mappings":"AAAA,wDAAwD;AACxD,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,OAAO,MAAM,0BAA0B,CAAC;AAI/C,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAC3C,OAAO,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AACtE,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AACjD,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AACjD,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AACjD,OAAO,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AACvD,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAEjD;;;;;GAKG;AAEH;;GAEG;AACH,MAAM,UAAU,gBAAgB,CAAC,KAAW;IAC1C,OAAO,KAAK,CAAC,OAAO,CAClB,KAAK,EACL,kCAAkC,EAClC,CAAC,KAAK,EAAE,EAAE;QACR,OAAO,KAAK;aACT,OAAO,CAAC,aAAa,IAAI,EAAE,CAAC;aAC5B,OAAO,CAAC;YACP,OAAO,EAAE,YAAY;YACrB,QAAQ,EAAE,2CAA2C;YACrD,OAAO,EAAE,eAAe;YACxB,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;gBACtB,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,MAAM,CAAC,UAAU,CAAC,CAAC;gBAChD,MAAM,EAAE,qBAAqB,EAAE,eAAe,EAAE,qBAAqB,EAAE,GACrE,MAAM,MAAM,CAAC,+BAA+B,CAAC,CAAC;gBAEhD,kCAAkC;gBAClC,IAAI,eAAe,CAAC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/mcp/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"list.d.ts","sourceRoot":"","sources":["../../../src/commands/mcp/list.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAUtD,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"list.d.ts","sourceRoot":"","sources":["../../../src/commands/mcp/list.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAUtD,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC;AAclC,MAAM,WAAW,eAAgB,SAAQ,aAAa;IACpD,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,IAAI;;;;;;;;;;GAoC3C;AAED;;GAEG;AACH,wBAAsB,WAAW,CAAC,IAAI,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,CAmHtE"}
|
|
@@ -2,7 +2,7 @@ import { createServerInstallationService } from '../../domains/server-management
|
|
|
2
2
|
import { inferTransportType } from '../../transport/transportFactory.js';
|
|
3
3
|
import printer from '../../utils/ui/printer.js';
|
|
4
4
|
import { redactCommandArgs, redactSensitiveValue, redactUrl, sanitizeHeaders, } from '../../utils/validation/sanitization.js';
|
|
5
|
-
import { getAllServers, initializeConfigContext, parseTags, validateConfigPath } from './utils/mcpServerConfig.js';
|
|
5
|
+
import { getAllEffectiveServers, getAllServers, getGlobalConfig, getInheritedKeys, initializeConfigContext, parseTags, validateConfigPath, } from './utils/mcpServerConfig.js';
|
|
6
6
|
import { calculateServerStatus } from './utils/serverUtils.js';
|
|
7
7
|
import { validateTags } from './utils/validation.js';
|
|
8
8
|
/**
|
|
@@ -26,7 +26,7 @@ export function buildListCommand(yargs) {
|
|
|
26
26
|
alias: 'g',
|
|
27
27
|
})
|
|
28
28
|
.option('verbose', {
|
|
29
|
-
describe: 'Show detailed server configuration',
|
|
29
|
+
describe: 'Show detailed effective server configuration, including inherited global defaults',
|
|
30
30
|
type: 'boolean',
|
|
31
31
|
default: false,
|
|
32
32
|
alias: 'v',
|
|
@@ -61,6 +61,8 @@ export async function listCommand(argv) {
|
|
|
61
61
|
}
|
|
62
62
|
// Get all servers
|
|
63
63
|
const allServers = getAllServers();
|
|
64
|
+
const allEffectiveServers = getAllEffectiveServers();
|
|
65
|
+
const globalConfig = getGlobalConfig();
|
|
64
66
|
if (Object.keys(allServers).length === 0) {
|
|
65
67
|
printer.info('No MCP servers are configured.');
|
|
66
68
|
printer.blank();
|
|
@@ -68,7 +70,7 @@ export async function listCommand(argv) {
|
|
|
68
70
|
return;
|
|
69
71
|
}
|
|
70
72
|
// Filter servers (apply outdated filter if requested)
|
|
71
|
-
let filteredServers = filterServers(
|
|
73
|
+
let filteredServers = filterServers(allEffectiveServers, showDisabled, tagsFilter);
|
|
72
74
|
if (outdated) {
|
|
73
75
|
filteredServers = await getOutdatedServers(filteredServers);
|
|
74
76
|
}
|
|
@@ -92,11 +94,20 @@ export async function listCommand(argv) {
|
|
|
92
94
|
.blank()
|
|
93
95
|
.title(`MCP Servers (${serverCount} server${serverCount === 1 ? '' : 's'})`)
|
|
94
96
|
.blank();
|
|
97
|
+
if (Object.keys(globalConfig).length > 0) {
|
|
98
|
+
printer.subtitle('Global Defaults:');
|
|
99
|
+
printGlobalSummary(globalConfig);
|
|
100
|
+
printer.blank();
|
|
101
|
+
}
|
|
95
102
|
// Sort servers by name for consistent output
|
|
96
103
|
const sortedServerNames = Object.keys(filteredServers).sort();
|
|
97
104
|
for (const serverName of sortedServerNames) {
|
|
98
|
-
const
|
|
99
|
-
|
|
105
|
+
const effectiveConfig = filteredServers[serverName];
|
|
106
|
+
const rawConfig = allServers[serverName];
|
|
107
|
+
if (!rawConfig) {
|
|
108
|
+
continue;
|
|
109
|
+
}
|
|
110
|
+
displayServer(serverName, rawConfig, effectiveConfig, globalConfig, verbose, showSecrets);
|
|
100
111
|
printer.blank();
|
|
101
112
|
}
|
|
102
113
|
// Summary information
|
|
@@ -177,14 +188,14 @@ function filterServers(servers, showDisabled, tagsFilter) {
|
|
|
177
188
|
/**
|
|
178
189
|
* Display a single server's information
|
|
179
190
|
*/
|
|
180
|
-
function displayServer(name,
|
|
181
|
-
const enabled = !
|
|
191
|
+
function displayServer(name, rawConfig, effectiveConfig, globalConfig, verbose, showSecrets = false) {
|
|
192
|
+
const enabled = !effectiveConfig.disabled;
|
|
182
193
|
// Get installation metadata
|
|
183
194
|
const version = 'unknown';
|
|
184
195
|
// Calculate server status
|
|
185
196
|
const serverStatus = calculateServerStatus(version);
|
|
186
197
|
// Infer type if missing
|
|
187
|
-
const inferredConfig =
|
|
198
|
+
const inferredConfig = effectiveConfig.type ? effectiveConfig : inferTransportType(effectiveConfig, name);
|
|
188
199
|
const displayType = inferredConfig.type || 'unknown';
|
|
189
200
|
// Display with installation metadata
|
|
190
201
|
printer.serverStatus(name, enabled);
|
|
@@ -253,5 +264,38 @@ function displayServer(name, config, verbose, showSecrets = false) {
|
|
|
253
264
|
}
|
|
254
265
|
}
|
|
255
266
|
}
|
|
267
|
+
if (verbose) {
|
|
268
|
+
const inherited = getInheritedKeys(rawConfig, effectiveConfig, globalConfig);
|
|
269
|
+
if (inherited.length > 0) {
|
|
270
|
+
printer.keyValue({ Inherited: inherited.join(', ') });
|
|
271
|
+
}
|
|
272
|
+
}
|
|
273
|
+
}
|
|
274
|
+
function printGlobalSummary(globalConfig) {
|
|
275
|
+
if (globalConfig.timeout !== undefined) {
|
|
276
|
+
printer.keyValue({ timeout: String(globalConfig.timeout) });
|
|
277
|
+
}
|
|
278
|
+
if (globalConfig.connectionTimeout !== undefined) {
|
|
279
|
+
printer.keyValue({ connectionTimeout: String(globalConfig.connectionTimeout) });
|
|
280
|
+
}
|
|
281
|
+
if (globalConfig.requestTimeout !== undefined) {
|
|
282
|
+
printer.keyValue({ requestTimeout: String(globalConfig.requestTimeout) });
|
|
283
|
+
}
|
|
284
|
+
if (globalConfig.inheritParentEnv !== undefined) {
|
|
285
|
+
printer.keyValue({ inheritParentEnv: String(globalConfig.inheritParentEnv) });
|
|
286
|
+
}
|
|
287
|
+
if (Array.isArray(globalConfig.envFilter) && globalConfig.envFilter.length > 0) {
|
|
288
|
+
printer.keyValue({ envFilter: `${globalConfig.envFilter.length} item(s)` });
|
|
289
|
+
}
|
|
290
|
+
if (globalConfig.oauth && typeof globalConfig.oauth === 'object') {
|
|
291
|
+
printer.keyValue({ oauth: '(configured)' });
|
|
292
|
+
}
|
|
293
|
+
if (globalConfig.headers && typeof globalConfig.headers === 'object' && !Array.isArray(globalConfig.headers)) {
|
|
294
|
+
printer.keyValue({ headers: `${Object.keys(globalConfig.headers).length} key(s)` });
|
|
295
|
+
}
|
|
296
|
+
if (globalConfig.env && typeof globalConfig.env === 'object') {
|
|
297
|
+
const envCount = Array.isArray(globalConfig.env) ? globalConfig.env.length : Object.keys(globalConfig.env).length;
|
|
298
|
+
printer.keyValue({ env: `${envCount} key(s)` });
|
|
299
|
+
}
|
|
256
300
|
}
|
|
257
301
|
//# sourceMappingURL=list.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../src/commands/mcp/list.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,+BAA+B,EAAE,MAAM,6DAA6D,CAAC;AAE9G,OAAO,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AACxE,OAAO,OAAO,MAAM,0BAA0B,CAAC;AAC/C,OAAO,EACL,iBAAiB,EACjB,oBAAoB,EACpB,SAAS,EACT,eAAe,GAChB,MAAM,uCAAuC,CAAC;AAI/C,OAAO,EAAE,aAAa,EAAE,uBAAuB,EAAE,SAAS,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AACnH,OAAO,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAUrD;;GAEG;AACH,MAAM,UAAU,gBAAgB,CAAC,KAAW;IAC1C,OAAO,KAAK;SACT,MAAM,CAAC,eAAe,EAAE;QACvB,QAAQ,EAAE,sCAAsC;QAChD,IAAI,EAAE,SAAS;QACf,OAAO,EAAE,KAAK;KACf,CAAC;SACD,MAAM,CAAC,cAAc,EAAE;QACtB,QAAQ,EAAE,yCAAyC;QACnD,IAAI,EAAE,SAAS;QACf,OAAO,EAAE,KAAK;KACf,CAAC;SACD,MAAM,CAAC,MAAM,EAAE;QACd,QAAQ,EAAE,0CAA0C;QACpD,IAAI,EAAE,QAAQ;QACd,KAAK,EAAE,GAAG;KACX,CAAC;SACD,MAAM,CAAC,SAAS,EAAE;QACjB,QAAQ,EAAE,oCAAoC;QAC9C,IAAI,EAAE,SAAS;QACf,OAAO,EAAE,KAAK;QACd,KAAK,EAAE,GAAG;KACX,CAAC;SACD,MAAM,CAAC,UAAU,EAAE;QAClB,QAAQ,EAAE,0CAA0C;QACpD,IAAI,EAAE,SAAS;QACf,OAAO,EAAE,KAAK;KACf,CAAC;SACD,OAAO,CAAC;QACP,CAAC,aAAa,EAAE,0BAA0B,CAAC;QAC3C,CAAC,6BAA6B,EAAE,qCAAqC,CAAC;QACtE,CAAC,4BAA4B,EAAE,yCAAyC,CAAC;QACzE,CAAC,6BAA6B,EAAE,iCAAiC,CAAC;QAClE,CAAC,wBAAwB,EAAE,0CAA0C,CAAC;QACtE,CAAC,uBAAuB,EAAE,mCAAmC,CAAC;KAC/D,CAAC,CAAC;AACP,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,WAAW,CAAC,IAAqB;IACrD,IAAI,CAAC;QACH,MAAM,EACJ,MAAM,EAAE,UAAU,EAClB,YAAY,EAAE,SAAS,EACvB,eAAe,EAAE,YAAY,GAAG,KAAK,EACrC,cAAc,EAAE,WAAW,GAAG,KAAK,EACnC,IAAI,EAAE,UAAU,EAChB,OAAO,GAAG,KAAK,EACf,QAAQ,GAAG,KAAK,GACjB,GAAG,IAAI,CAAC;QAET,6CAA6C;QAC7C,uBAAuB,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;QAE/C,uBAAuB;QACvB,kBAAkB,EAAE,CAAC;QAErB,mCAAmC;QACnC,IAAI,UAAU,EAAE,CAAC;YACf,YAAY,CAAC,UAAU,CAAC,CAAC;QAC3B,CAAC;QAED,kBAAkB;QAClB,MAAM,UAAU,GAAG,aAAa,EAAE,CAAC;QAEnC,IAAI,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACzC,OAAO,CAAC,IAAI,CAAC,gCAAgC,CAAC,CAAC;YAC/C,OAAO,CAAC,KAAK,EAAE,CAAC;YAChB,OAAO,CAAC,IAAI,CAAC,mDAAmD,CAAC,CAAC;YAClE,OAAO;QACT,CAAC;QAED,sDAAsD;QACtD,IAAI,eAAe,GAAG,aAAa,CAAC,UAAU,EAAE,YAAY,EAAE,UAAU,CAAC,CAAC;QAE1E,IAAI,QAAQ,EAAE,CAAC;YACb,eAAe,GAAG,MAAM,kBAAkB,CAAC,eAAe,CAAC,CAAC;QAC9D,CAAC;QAED,IAAI,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC9C,IAAI,UAAU,EAAE,CAAC;gBACf,OAAO,CAAC,IAAI,CAAC,iDAAiD,UAAU,EAAE,CAAC,CAAC;YAC9E,CAAC;iBAAM,IAAI,CAAC,YAAY,EAAE,CAAC;gBACzB,OAAO,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAC;gBAC1C,OAAO,CAAC,KAAK,EAAE,CAAC;gBAChB,OAAO,CAAC,IAAI,CAAC,+FAA+F,CAAC,CAAC;YAChH,CAAC;iBAAM,CAAC;gBACN,OAAO,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;YACpC,CAAC;YACD,OAAO;QACT,CAAC;QAED,kBAAkB;QAClB,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,MAAM,CAAC;QACxD,OAAO;aACJ,KAAK,EAAE;aACP,KAAK,CAAC,gBAAgB,WAAW,UAAU,WAAW,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC;aAC3E,KAAK,EAAE,CAAC;QAEX,6CAA6C;QAC7C,MAAM,iBAAiB,GAAG,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,IAAI,EAAE,CAAC;QAE9D,KAAK,MAAM,UAAU,IAAI,iBAAiB,EAAE,CAAC;YAC3C,MAAM,MAAM,GAAG,eAAe,CAAC,UAAU,CAAC,CAAC;YAC3C,aAAa,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC;YACxD,OAAO,CAAC,KAAK,EAAE,CAAC;QAClB,CAAC;QAED,sBAAsB;QACtB,MAAM,YAAY,GAAG,iBAAiB,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC;QAChG,MAAM,aAAa,GAAG,iBAAiB,CAAC,MAAM,GAAG,YAAY,CAAC;QAE9D,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;QAC7B,OAAO,CAAC,QAAQ,CAAC;YACf,KAAK,EAAE,GAAG,iBAAiB,CAAC,MAAM,UAAU,iBAAiB,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE;YACvF,OAAO,EAAE,YAAY;SACtB,CAAC,CAAC;QAEH,IAAI,YAAY,IAAI,aAAa,GAAG,CAAC,EAAE,CAAC;YACtC,OAAO,CAAC,QAAQ,CAAC,EAAE,QAAQ,EAAE,aAAa,EAAE,CAAC,CAAC;QAChD,CAAC;QAED,IAAI,UAAU,EAAE,CAAC;YACf,OAAO,CAAC,QAAQ,CAAC,EAAE,kBAAkB,EAAE,UAAU,EAAE,CAAC,CAAC;QACvD,CAAC;QAED,IAAI,WAAW,EAAE,CAAC;YAChB,OAAO,CAAC,KAAK,EAAE,CAAC;YAChB,OAAO,CAAC,IAAI,CAAC,6DAA6D,CAAC,CAAC;QAC9E,CAAC;QAED,IAAI,CAAC,YAAY,IAAI,aAAa,GAAG,CAAC,EAAE,CAAC;YACvC,OAAO,CAAC,KAAK,EAAE,CAAC;YAChB,OAAO,CAAC,IAAI,CACV,GAAG,aAAa,mBAAmB,aAAa,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,kDAAkD,CACpH,CAAC;QACJ,CAAC;IACH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,OAAO,CAAC,KAAK,CAAC,2BAA2B,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC;QAC3F,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;AACH,CAAC;AAED;;GAEG;AACH,KAAK,UAAU,kBAAkB,CAAC,OAAwC;IACxE,MAAM,QAAQ,GAAoC,EAAE,CAAC;IAErD,sCAAsC;IACtC,MAAM,mBAAmB,GAAG,+BAA+B,EAAE,CAAC;IAE9D,2BAA2B;IAC3B,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAEzC,oCAAoC;IACpC,MAAM,aAAa,GAAG,MAAM,mBAAmB,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC;IAE7E,gDAAgD;IAChD,MAAM,kBAAkB,GAAG,aAAa;SACrC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,SAAS,IAAI,MAAM,CAAC,eAAe,CAAC;SAC9D,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IAEtC,+BAA+B;IAC/B,KAAK,MAAM,UAAU,IAAI,kBAAkB,EAAE,CAAC;QAC5C,IAAI,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;YACxB,QAAQ,CAAC,UAAU,CAAC,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;QAC7C,CAAC;IACH,CAAC;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED;;GAEG;AACH,SAAS,aAAa,CACpB,OAAwC,EACxC,YAAqB,EACrB,UAAmB;IAEnB,MAAM,QAAQ,GAAoC,EAAE,CAAC;IAErD,gCAAgC;IAChC,MAAM,UAAU,GAAG,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAElE,KAAK,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;QACrD,oDAAoD;QACpD,IAAI,MAAM,CAAC,QAAQ,IAAI,CAAC,YAAY,EAAE,CAAC;YACrC,SAAS;QACX,CAAC;QAED,gCAAgC;QAChC,IAAI,UAAU,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACxC,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC;YACrC,MAAM,cAAc,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CACnD,UAAU,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,WAAW,EAAE,KAAK,SAAS,CAAC,WAAW,EAAE,CAAC,CACpF,CAAC;YAEF,IAAI,CAAC,cAAc,EAAE,CAAC;gBACpB,SAAS;YACX,CAAC;QACH,CAAC;QAED,QAAQ,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC;IAC1B,CAAC;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED;;GAEG;AACH,SAAS,aAAa,CAAC,IAAY,EAAE,MAAuB,EAAE,OAAgB,EAAE,cAAuB,KAAK;IAC1G,MAAM,OAAO,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC;IAEjC,4BAA4B;IAC5B,MAAM,OAAO,GAAG,SAAS,CAAC;IAE1B,0BAA0B;IAC1B,MAAM,YAAY,GAAG,qBAAqB,CAAC,OAAO,CAAC,CAAC;IAEpD,wBAAwB;IACxB,MAAM,cAAc,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,kBAAkB,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAC/E,MAAM,WAAW,GAAG,cAAc,CAAC,IAAI,IAAI,SAAS,CAAC;IAErD,qCAAqC;IACrC,OAAO,CAAC,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAEpC,wBAAwB;IACxB,OAAO,CAAC,QAAQ,CAAC;QACf,IAAI,EAAE,WAAW;QACjB,OAAO,EAAE,OAAO;KACjB,CAAC,CAAC;IAEH,0BAA0B;IAC1B,IAAI,YAAY,KAAK,UAAU,EAAE,CAAC;QAChC,OAAO,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;IAC1C,CAAC;IAED,4BAA4B;IAC5B,IAAI,cAAc,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;QACpC,IAAI,cAAc,CAAC,OAAO,EAAE,CAAC;YAC3B,OAAO,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,cAAc,CAAC,OAAO,EAAE,CAAC,CAAC;QACxD,CAAC;QACD,IAAI,cAAc,CAAC,IAAI,IAAI,cAAc,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC1D,MAAM,WAAW,GAAG,WAAW,CAAC,CAAC,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,iBAAiB,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;YAC/F,OAAO,CAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACpD,CAAC;QACD,IAAI,cAAc,CAAC,GAAG,EAAE,CAAC;YACvB,OAAO,CAAC,QAAQ,CAAC,EAAE,mBAAmB,EAAE,cAAc,CAAC,GAAG,EAAE,CAAC,CAAC;QAChE,CAAC;QAED,qCAAqC;QACrC,IAAI,cAAc,CAAC,aAAa,EAAE,CAAC;YACjC,OAAO,CAAC,QAAQ,CAAC,EAAE,iBAAiB,EAAE,SAAS,EAAE,CAAC,CAAC;YACnD,IAAI,cAAc,CAAC,WAAW,KAAK,SAAS,EAAE,CAAC;gBAC7C,OAAO,CAAC,QAAQ,CAAC,EAAE,cAAc,EAAE,cAAc,CAAC,WAAW,EAAE,CAAC,CAAC;YACnE,CAAC;iBAAM,CAAC;gBACN,OAAO,CAAC,QAAQ,CAAC,EAAE,cAAc,EAAE,WAAW,EAAE,CAAC,CAAC;YACpD,CAAC;YACD,MAAM,KAAK,GAAG,cAAc,CAAC,YAAY,IAAI,IAAI,CAAC;YAClD,OAAO,CAAC,QAAQ,CAAC,EAAE,eAAe,EAAE,GAAG,KAAK,IAAI,EAAE,CAAC,CAAC;QACtD,CAAC;IACH,CAAC;SAAM,IAAI,cAAc,CAAC,IAAI,KAAK,MAAM,IAAI,cAAc,CAAC,IAAI,KAAK,KAAK,EAAE,CAAC;QAC3E,MAAM,UAAU,GAAG,WAAW,CAAC,CAAC,CAAC,cAAc,CAAC,GAAG,IAAI,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,cAAc,CAAC,GAAG,IAAI,EAAE,CAAC,CAAC;QAChG,OAAO,CAAC,QAAQ,CAAC,EAAE,GAAG,EAAE,UAAU,EAAE,CAAC,CAAC;QACtC,IAAI,cAAc,CAAC,OAAO,IAAI,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC7E,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC;YAC/D,OAAO,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,GAAG,WAAW,UAAU,WAAW,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;YAEtF,IAAI,OAAO,EAAE,CAAC;gBACZ,MAAM,cAAc,GAAG,WAAW,CAAC,CAAC,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC,eAAe,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;gBACtG,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE,CAAC;oBAC1D,OAAO,CAAC,GAAG,CAAC,QAAQ,GAAG,KAAK,KAAK,EAAE,CAAC,CAAC;gBACvC,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAED,oBAAoB;IACpB,IAAI,cAAc,CAAC,IAAI,IAAI,cAAc,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC1D,OAAO,CAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC7D,CAAC;IAED,IAAI,cAAc,CAAC,OAAO,EAAE,CAAC;QAC3B,OAAO,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,GAAG,cAAc,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC;IAC/D,CAAC;IAED,IAAI,cAAc,CAAC,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACrE,MAAM,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC;QACxD,OAAO,CAAC,QAAQ,CAAC,EAAE,WAAW,EAAE,GAAG,QAAQ,YAAY,QAAQ,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;QAEtF,IAAI,OAAO,EAAE,CAAC;YACZ,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,CAAC;gBAC9D,MAAM,YAAY,GAAG,WAAW,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,oBAAoB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;gBAC/E,OAAO,CAAC,GAAG,CAAC,QAAQ,GAAG,IAAI,YAAY,EAAE,CAAC,CAAC;YAC7C,CAAC;QACH,CAAC;IACH,CAAC;AACH,CAAC"}
|
|
1
|
+
{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../src/commands/mcp/list.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"status.d.ts","sourceRoot":"","sources":["../../../src/commands/mcp/status.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"status.d.ts","sourceRoot":"","sources":["../../../src/commands/mcp/status.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAKtD,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC;AAclC,MAAM,WAAW,iBAAkB,SAAQ,aAAa;IACtD,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,IAAI;;;;GAiB7C;AAED;;GAEG;AACH,wBAAsB,aAAa,CAAC,IAAI,EAAE,iBAAiB,GAAG,OAAO,CAAC,IAAI,CAAC,CAqB1E"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
|
+
import { sanitizeForLogging } from '../../logger/secureLogger.js';
|
|
1
2
|
import { inferTransportType } from '../../transport/transportFactory.js';
|
|
2
3
|
import printer from '../../utils/ui/printer.js';
|
|
3
|
-
import { getAllServers, getServer, initializeConfigContext, validateConfigPath } from './utils/mcpServerConfig.js';
|
|
4
|
+
import { getAllEffectiveServers, getAllServers, getEffectiveServerConfig, getGlobalConfig, getInheritedKeys, getServer, initializeConfigContext, validateConfigPath, } from './utils/mcpServerConfig.js';
|
|
4
5
|
import { validateServerName } from './utils/validation.js';
|
|
5
6
|
/**
|
|
6
7
|
* Build the status command configuration
|
|
@@ -12,7 +13,7 @@ export function buildStatusCommand(yargs) {
|
|
|
12
13
|
type: 'string',
|
|
13
14
|
})
|
|
14
15
|
.option('verbose', {
|
|
15
|
-
describe: 'Show detailed status information',
|
|
16
|
+
describe: 'Show detailed status information with effective merged configuration',
|
|
16
17
|
type: 'boolean',
|
|
17
18
|
default: false,
|
|
18
19
|
alias: 'v',
|
|
@@ -54,42 +55,61 @@ async function showServerStatus(serverName, verbose = false) {
|
|
|
54
55
|
// Validate server name
|
|
55
56
|
validateServerName(serverName);
|
|
56
57
|
// Get server configuration
|
|
57
|
-
const
|
|
58
|
-
|
|
58
|
+
const rawServerConfig = getServer(serverName);
|
|
59
|
+
const effectiveServerConfig = getEffectiveServerConfig(serverName);
|
|
60
|
+
if (!rawServerConfig || !effectiveServerConfig) {
|
|
59
61
|
throw new Error(`Server '${serverName}' does not exist.`);
|
|
60
62
|
}
|
|
61
63
|
printer.blank();
|
|
62
64
|
printer.title(`Server Status: ${serverName}`);
|
|
63
65
|
printer.blank();
|
|
64
|
-
displayDetailedServerStatus(serverName,
|
|
66
|
+
displayDetailedServerStatus(serverName, rawServerConfig, effectiveServerConfig, getGlobalConfig(), verbose);
|
|
65
67
|
}
|
|
66
68
|
/**
|
|
67
69
|
* Show status for all servers
|
|
68
70
|
*/
|
|
69
71
|
async function showAllServersStatus(verbose = false) {
|
|
70
72
|
const allServers = getAllServers();
|
|
71
|
-
|
|
73
|
+
const allEffectiveServers = getAllEffectiveServers();
|
|
74
|
+
const globalConfig = getGlobalConfig();
|
|
75
|
+
if (Object.keys(allEffectiveServers).length === 0) {
|
|
72
76
|
printer.info('No MCP servers are configured.');
|
|
73
77
|
printer.info('Use "mcp add <name>" to add your first server.');
|
|
74
78
|
return;
|
|
75
79
|
}
|
|
76
80
|
printer
|
|
77
81
|
.blank()
|
|
78
|
-
.title(`MCP Servers Status (${Object.keys(
|
|
82
|
+
.title(`MCP Servers Status (${Object.keys(allEffectiveServers).length} server${Object.keys(allEffectiveServers).length === 1 ? '' : 's'})`)
|
|
79
83
|
.blank();
|
|
84
|
+
if (Object.keys(globalConfig).length > 0) {
|
|
85
|
+
printer.subtitle('Global Defaults:');
|
|
86
|
+
printer.keyValue({
|
|
87
|
+
timeout: globalConfig.timeout !== undefined ? `${globalConfig.timeout}ms` : '(none)',
|
|
88
|
+
connectionTimeout: globalConfig.connectionTimeout !== undefined ? `${globalConfig.connectionTimeout}ms` : '(none)',
|
|
89
|
+
requestTimeout: globalConfig.requestTimeout !== undefined ? `${globalConfig.requestTimeout}ms` : '(none)',
|
|
90
|
+
});
|
|
91
|
+
printer.blank();
|
|
92
|
+
}
|
|
80
93
|
// Sort servers by name for consistent output
|
|
81
|
-
const sortedServerNames = Object.keys(
|
|
94
|
+
const sortedServerNames = Object.keys(allEffectiveServers).sort();
|
|
82
95
|
for (const serverName of sortedServerNames) {
|
|
83
|
-
const
|
|
84
|
-
displayServerStatusSummary(serverName,
|
|
96
|
+
const effectiveConfig = allEffectiveServers[serverName];
|
|
97
|
+
displayServerStatusSummary(serverName, effectiveConfig);
|
|
98
|
+
if (verbose && allServers[serverName]) {
|
|
99
|
+
const inherited = getInheritedKeys(allServers[serverName], effectiveConfig, globalConfig);
|
|
100
|
+
if (inherited.length > 0) {
|
|
101
|
+
printer.keyValue({ Inherited: inherited.join(', ') });
|
|
102
|
+
}
|
|
103
|
+
}
|
|
85
104
|
printer.blank(); // Empty line between servers
|
|
86
105
|
}
|
|
87
106
|
// Overall summary
|
|
88
|
-
const enabledCount = sortedServerNames.filter((name) => !
|
|
107
|
+
const enabledCount = sortedServerNames.filter((name) => !allEffectiveServers[name].disabled).length;
|
|
89
108
|
const disabledCount = sortedServerNames.length - enabledCount;
|
|
90
|
-
const stdioCount = sortedServerNames.filter((name) =>
|
|
91
|
-
const httpCount = sortedServerNames.filter((name) =>
|
|
92
|
-
const sseCount = sortedServerNames.filter((name) =>
|
|
109
|
+
const stdioCount = sortedServerNames.filter((name) => allEffectiveServers[name].type === 'stdio').length;
|
|
110
|
+
const httpCount = sortedServerNames.filter((name) => allEffectiveServers[name].type === 'http').length;
|
|
111
|
+
const sseCount = sortedServerNames.filter((name) => allEffectiveServers[name].type === 'sse').length;
|
|
112
|
+
const streamableHttpCount = sortedServerNames.filter((name) => allEffectiveServers[name].type === 'streamableHttp').length;
|
|
93
113
|
printer.subtitle('Overall Summary:');
|
|
94
114
|
printer.keyValue({
|
|
95
115
|
'Total Servers': sortedServerNames.length,
|
|
@@ -100,10 +120,11 @@ async function showAllServersStatus(verbose = false) {
|
|
|
100
120
|
stdio: stdioCount,
|
|
101
121
|
http: httpCount,
|
|
102
122
|
sse: sseCount,
|
|
123
|
+
streamableHttp: streamableHttpCount,
|
|
103
124
|
});
|
|
104
125
|
// Get unique tags
|
|
105
126
|
const allTags = new Set();
|
|
106
|
-
for (const config of Object.values(
|
|
127
|
+
for (const config of Object.values(allEffectiveServers)) {
|
|
107
128
|
if (config.tags) {
|
|
108
129
|
config.tags.forEach((tag) => allTags.add(tag));
|
|
109
130
|
}
|
|
@@ -133,7 +154,8 @@ function displayServerStatusSummary(name, config) {
|
|
|
133
154
|
if (inferredConfig.type === 'stdio' && inferredConfig.command) {
|
|
134
155
|
printer.keyValue({ Command: inferredConfig.command });
|
|
135
156
|
}
|
|
136
|
-
else if ((inferredConfig.type === 'http' || inferredConfig.type === 'sse'
|
|
157
|
+
else if ((inferredConfig.type === 'http' || inferredConfig.type === 'sse' || inferredConfig.type === 'streamableHttp') &&
|
|
158
|
+
inferredConfig.url) {
|
|
137
159
|
printer.keyValue({ URL: inferredConfig.url });
|
|
138
160
|
}
|
|
139
161
|
if (config.tags && config.tags.length > 0) {
|
|
@@ -143,11 +165,11 @@ function displayServerStatusSummary(name, config) {
|
|
|
143
165
|
/**
|
|
144
166
|
* Display detailed status for a server (used in single server view)
|
|
145
167
|
*/
|
|
146
|
-
function displayDetailedServerStatus(name,
|
|
147
|
-
const statusIcon =
|
|
148
|
-
const statusText =
|
|
168
|
+
function displayDetailedServerStatus(name, rawConfig, effectiveConfig, globalConfig, verbose) {
|
|
169
|
+
const statusIcon = effectiveConfig.disabled ? 'đ´' : 'đĸ';
|
|
170
|
+
const statusText = effectiveConfig.disabled ? 'Disabled' : 'Enabled';
|
|
149
171
|
// Infer type if missing
|
|
150
|
-
const inferredConfig =
|
|
172
|
+
const inferredConfig = effectiveConfig.type ? effectiveConfig : inferTransportType(effectiveConfig, name);
|
|
151
173
|
const displayType = inferredConfig.type || 'unknown';
|
|
152
174
|
printer.subtitle('Configuration:');
|
|
153
175
|
printer.keyValue({
|
|
@@ -171,7 +193,9 @@ function displayDetailedServerStatus(name, config, verbose) {
|
|
|
171
193
|
}
|
|
172
194
|
printer.keyValue({ 'Working Directory': inferredConfig.cwd || '(current directory)' });
|
|
173
195
|
}
|
|
174
|
-
else if (inferredConfig.type === 'http' ||
|
|
196
|
+
else if (inferredConfig.type === 'http' ||
|
|
197
|
+
inferredConfig.type === 'sse' ||
|
|
198
|
+
inferredConfig.type === 'streamableHttp') {
|
|
175
199
|
if (inferredConfig.url) {
|
|
176
200
|
printer.keyValue({ URL: inferredConfig.url });
|
|
177
201
|
}
|
|
@@ -186,7 +210,11 @@ function displayDetailedServerStatus(name, config, verbose) {
|
|
|
186
210
|
}
|
|
187
211
|
}
|
|
188
212
|
// Common configuration
|
|
189
|
-
printer.keyValue({
|
|
213
|
+
printer.keyValue({
|
|
214
|
+
Timeout: inferredConfig.timeout !== undefined ? `${inferredConfig.timeout}ms` : '(default)',
|
|
215
|
+
'Connection Timeout': inferredConfig.connectionTimeout !== undefined ? `${inferredConfig.connectionTimeout}ms` : '(default)',
|
|
216
|
+
'Request Timeout': inferredConfig.requestTimeout !== undefined ? `${inferredConfig.requestTimeout}ms` : '(default)',
|
|
217
|
+
});
|
|
190
218
|
printer.keyValue({
|
|
191
219
|
Tags: inferredConfig.tags && inferredConfig.tags.length > 0 ? inferredConfig.tags.join(', ') : '(none)',
|
|
192
220
|
});
|
|
@@ -208,11 +236,15 @@ function displayDetailedServerStatus(name, config, verbose) {
|
|
|
208
236
|
else {
|
|
209
237
|
printer.keyValue({ 'Environment Variables': '(none)' });
|
|
210
238
|
}
|
|
239
|
+
const inherited = getInheritedKeys(rawConfig, effectiveConfig, globalConfig);
|
|
240
|
+
if (inherited.length > 0) {
|
|
241
|
+
printer.keyValue({ Inherited: inherited.join(', ') });
|
|
242
|
+
}
|
|
211
243
|
// Runtime status (this would require integration with ServerManager to get actual runtime status)
|
|
212
244
|
printer.blank();
|
|
213
245
|
printer.subtitle('Runtime Information:');
|
|
214
|
-
printer.keyValue({ 'Configuration
|
|
215
|
-
if (
|
|
246
|
+
printer.keyValue({ 'Effective Configuration': JSON.stringify(sanitizeForLogging(effectiveConfig)) });
|
|
247
|
+
if (effectiveConfig.disabled) {
|
|
216
248
|
printer.keyValue({ 'Runtime Status': 'âšī¸ Not running (disabled)' });
|
|
217
249
|
printer.info(`Use 'mcp enable ${name}' to enable this server.`);
|
|
218
250
|
}
|
|
@@ -224,7 +256,7 @@ function displayDetailedServerStatus(name, config, verbose) {
|
|
|
224
256
|
printer.blank();
|
|
225
257
|
printer.subtitle('Validation:');
|
|
226
258
|
try {
|
|
227
|
-
validateServerConfiguration(
|
|
259
|
+
validateServerConfiguration(effectiveConfig);
|
|
228
260
|
printer.info('Configuration: Valid â');
|
|
229
261
|
}
|
|
230
262
|
catch (error) {
|
|
@@ -234,7 +266,7 @@ function displayDetailedServerStatus(name, config, verbose) {
|
|
|
234
266
|
// Quick actions
|
|
235
267
|
printer.blank();
|
|
236
268
|
printer.subtitle('Quick Actions:');
|
|
237
|
-
if (
|
|
269
|
+
if (effectiveConfig.disabled) {
|
|
238
270
|
printer.info(` âĸ Enable: mcp enable ${name}`);
|
|
239
271
|
}
|
|
240
272
|
else {
|
|
@@ -258,6 +290,7 @@ function validateServerConfiguration(config) {
|
|
|
258
290
|
break;
|
|
259
291
|
case 'http':
|
|
260
292
|
case 'sse':
|
|
293
|
+
case 'streamableHttp':
|
|
261
294
|
if (!config.url) {
|
|
262
295
|
throw new Error(`URL is required for ${config.type} servers`);
|
|
263
296
|
}
|