@structured-world/gitlab-mcp 10.0.1 → 11.0.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 +6 -6
- package/README.md.in +1 -1
- package/dist/src/channel-gateway/format.js +7 -1
- package/dist/src/channel-gateway/format.js.map +1 -1
- package/dist/src/channel-gateway/forwarding.d.ts +3 -0
- package/dist/src/channel-gateway/forwarding.js +8 -1
- package/dist/src/channel-gateway/forwarding.js.map +1 -1
- package/dist/src/channel-gateway/gateway.d.ts +7 -0
- package/dist/src/channel-gateway/gateway.js +80 -16
- package/dist/src/channel-gateway/gateway.js.map +1 -1
- package/dist/src/cli/docker/container-runtime.d.ts +1 -0
- package/dist/src/cli/docker/container-runtime.js +37 -5
- package/dist/src/cli/docker/container-runtime.js.map +1 -1
- package/dist/src/cli/docker/docker-command.js +11 -2
- package/dist/src/cli/docker/docker-command.js.map +1 -1
- package/dist/src/cli/docker/docker-utils.d.ts +1 -0
- package/dist/src/cli/docker/docker-utils.js +137 -27
- package/dist/src/cli/docker/docker-utils.js.map +1 -1
- package/dist/src/cli/docker/oauth-issuer-prompt.d.ts +2 -0
- package/dist/src/cli/docker/oauth-issuer-prompt.js +47 -0
- package/dist/src/cli/docker/oauth-issuer-prompt.js.map +1 -0
- package/dist/src/cli/docker/types.d.ts +18 -4
- package/dist/src/cli/docker/types.js.map +1 -1
- package/dist/src/cli/list-tools.js +14 -35
- package/dist/src/cli/list-tools.js.map +1 -1
- package/dist/src/cli/setup/flows/server-setup.js +15 -0
- package/dist/src/cli/setup/flows/server-setup.js.map +1 -1
- package/dist/src/config/instances-loader.js +17 -3
- package/dist/src/config/instances-loader.js.map +1 -1
- package/dist/src/config/instances-schema.d.ts +6 -3
- package/dist/src/config/instances-schema.js +7 -6
- package/dist/src/config/instances-schema.js.map +1 -1
- package/dist/src/config.js.map +1 -1
- package/dist/src/configuration/caller.d.ts +10 -0
- package/dist/src/configuration/caller.js +39 -0
- package/dist/src/configuration/caller.js.map +1 -0
- package/dist/src/configuration/composed-feeds.d.ts +31 -0
- package/dist/src/configuration/composed-feeds.js +698 -0
- package/dist/src/configuration/composed-feeds.js.map +1 -0
- package/dist/src/configuration/composed-listings.d.ts +14 -0
- package/dist/src/configuration/composed-listings.js +157 -0
- package/dist/src/configuration/composed-listings.js.map +1 -0
- package/dist/src/configuration/groups.d.ts +8 -0
- package/dist/src/configuration/groups.js +39 -0
- package/dist/src/configuration/groups.js.map +1 -0
- package/dist/src/configuration/index.d.ts +6 -0
- package/dist/src/configuration/index.js +87 -0
- package/dist/src/configuration/index.js.map +1 -0
- package/dist/src/configuration/policy.d.ts +34 -0
- package/dist/src/configuration/policy.js +122 -0
- package/dist/src/configuration/policy.js.map +1 -0
- package/dist/src/configuration/scope-ids.d.ts +7 -0
- package/dist/src/configuration/scope-ids.js +78 -0
- package/dist/src/configuration/scope-ids.js.map +1 -0
- package/dist/src/configuration/scope-projects.d.ts +5 -0
- package/dist/src/configuration/scope-projects.js +76 -0
- package/dist/src/configuration/scope-projects.js.map +1 -0
- package/dist/src/configuration/scope-targets.d.ts +26 -0
- package/dist/src/configuration/scope-targets.js +307 -0
- package/dist/src/configuration/scope-targets.js.map +1 -0
- package/dist/src/configuration/scoped-execution.d.ts +6 -0
- package/dist/src/configuration/scoped-execution.js +577 -0
- package/dist/src/configuration/scoped-execution.js.map +1 -0
- package/dist/src/configuration/scoped-feeds.d.ts +22 -0
- package/dist/src/configuration/scoped-feeds.js +136 -0
- package/dist/src/configuration/scoped-feeds.js.map +1 -0
- package/dist/src/configuration/service.d.ts +53 -0
- package/dist/src/configuration/service.js +186 -0
- package/dist/src/configuration/service.js.map +1 -0
- package/dist/src/configuration/settings-store.d.ts +20 -0
- package/dist/src/configuration/settings-store.js +228 -0
- package/dist/src/configuration/settings-store.js.map +1 -0
- package/dist/src/configuration/types.d.ts +30 -0
- package/dist/src/configuration/types.js +20 -0
- package/dist/src/configuration/types.js.map +1 -0
- package/dist/src/contracts/storage.d.ts +2 -1
- package/dist/src/dashboard/html-template.js +8 -15
- package/dist/src/dashboard/html-template.js.map +1 -1
- package/dist/src/dashboard/metrics.d.ts +1 -1
- package/dist/src/entities/context/connection-check.d.ts +64 -0
- package/dist/src/entities/context/connection-check.js +117 -0
- package/dist/src/entities/context/connection-check.js.map +1 -0
- package/dist/src/entities/context/context-manager.d.ts +10 -22
- package/dist/src/entities/context/context-manager.js +108 -207
- package/dist/src/entities/context/context-manager.js.map +1 -1
- package/dist/src/entities/context/handlers.d.ts +3 -5
- package/dist/src/entities/context/handlers.js +2 -14
- package/dist/src/entities/context/handlers.js.map +1 -1
- package/dist/src/entities/context/output-schema.d.ts +272 -0
- package/dist/src/entities/context/output-schema.js +182 -0
- package/dist/src/entities/context/output-schema.js.map +1 -0
- package/dist/src/entities/context/profile.d.ts +29 -0
- package/dist/src/entities/context/profile.js +72 -0
- package/dist/src/entities/context/profile.js.map +1 -0
- package/dist/src/entities/context/registry.js +140 -3
- package/dist/src/entities/context/registry.js.map +1 -1
- package/dist/src/entities/context/schema.d.ts +6 -14
- package/dist/src/entities/context/schema.js +6 -13
- package/dist/src/entities/context/schema.js.map +1 -1
- package/dist/src/entities/context/scope-search.d.ts +49 -0
- package/dist/src/entities/context/scope-search.js +71 -0
- package/dist/src/entities/context/scope-search.js.map +1 -0
- package/dist/src/entities/context/settings-panel.d.ts +13 -0
- package/dist/src/entities/context/settings-panel.js +508 -0
- package/dist/src/entities/context/settings-panel.js.map +1 -0
- package/dist/src/entities/context/settings.d.ts +78 -0
- package/dist/src/entities/context/settings.js +239 -0
- package/dist/src/entities/context/settings.js.map +1 -0
- package/dist/src/entities/context/types.d.ts +3 -4
- package/dist/src/entities/context/whoami.js +39 -31
- package/dist/src/entities/context/whoami.js.map +1 -1
- package/dist/src/entities/core/registry.js +34 -33
- package/dist/src/entities/core/registry.js.map +1 -1
- package/dist/src/entities/environments/schema-readonly.d.ts +3 -3
- package/dist/src/entities/files/registry.js +3 -2
- package/dist/src/entities/files/registry.js.map +1 -1
- package/dist/src/entities/iterations/registry.js +3 -2
- package/dist/src/entities/iterations/registry.js.map +1 -1
- package/dist/src/entities/mrs/registry.js +11 -5
- package/dist/src/entities/mrs/registry.js.map +1 -1
- package/dist/src/entities/mrs/schema-readonly.d.ts +8 -2
- package/dist/src/entities/mrs/schema-readonly.js +31 -3
- package/dist/src/entities/mrs/schema-readonly.js.map +1 -1
- package/dist/src/entities/pipelines/registry.js +3 -2
- package/dist/src/entities/pipelines/registry.js.map +1 -1
- package/dist/src/entities/pipelines/schema-readonly.d.ts +3 -3
- package/dist/src/entities/runners/project-access.d.ts +14 -0
- package/dist/src/entities/runners/project-access.js +64 -0
- package/dist/src/entities/runners/project-access.js.map +1 -0
- package/dist/src/entities/runners/registry.js +54 -26
- package/dist/src/entities/runners/registry.js.map +1 -1
- package/dist/src/entities/search/schema-readonly.d.ts +28 -28
- package/dist/src/graphql/runners.d.ts +26 -1
- package/dist/src/graphql/runners.js +43 -6
- package/dist/src/graphql/runners.js.map +1 -1
- package/dist/src/graphql/vulnerabilities.d.ts +3 -0
- package/dist/src/graphql/vulnerabilities.js +1 -0
- package/dist/src/graphql/vulnerabilities.js.map +1 -1
- package/dist/src/handlers.js +218 -142
- package/dist/src/handlers.js.map +1 -1
- package/dist/src/logger.d.ts +3 -2
- package/dist/src/mcp-apps.d.ts +6 -0
- package/dist/src/mcp-apps.js +8 -0
- package/dist/src/mcp-apps.js.map +1 -0
- package/dist/src/middleware/mcp-auth-routes.d.ts +3 -0
- package/dist/src/middleware/mcp-auth-routes.js +9 -0
- package/dist/src/middleware/mcp-auth-routes.js.map +1 -0
- package/dist/src/middleware/oauth-auth.js +83 -23
- package/dist/src/middleware/oauth-auth.js.map +1 -1
- package/dist/src/middleware/rate-limiter.js +11 -10
- package/dist/src/middleware/rate-limiter.js.map +1 -1
- package/dist/src/oauth/authorization-response.d.ts +1 -0
- package/dist/src/oauth/authorization-response.js +14 -0
- package/dist/src/oauth/authorization-response.js.map +1 -0
- package/dist/src/oauth/client-auth.d.ts +16 -0
- package/dist/src/oauth/client-auth.js +73 -0
- package/dist/src/oauth/client-auth.js.map +1 -0
- package/dist/src/oauth/config.d.ts +2 -0
- package/dist/src/oauth/config.js +37 -0
- package/dist/src/oauth/config.js.map +1 -1
- package/dist/src/oauth/endpoints/authorize.d.ts +1 -0
- package/dist/src/oauth/endpoints/authorize.js +361 -102
- package/dist/src/oauth/endpoints/authorize.js.map +1 -1
- package/dist/src/oauth/endpoints/callback.js +78 -41
- package/dist/src/oauth/endpoints/callback.js.map +1 -1
- package/dist/src/oauth/endpoints/index.d.ts +1 -0
- package/dist/src/oauth/endpoints/index.js +3 -1
- package/dist/src/oauth/endpoints/index.js.map +1 -1
- package/dist/src/oauth/endpoints/metadata.d.ts +1 -1
- package/dist/src/oauth/endpoints/metadata.js +23 -8
- package/dist/src/oauth/endpoints/metadata.js.map +1 -1
- package/dist/src/oauth/endpoints/register.d.ts +3 -2
- package/dist/src/oauth/endpoints/register.js +70 -19
- package/dist/src/oauth/endpoints/register.js.map +1 -1
- package/dist/src/oauth/endpoints/revoke.d.ts +2 -0
- package/dist/src/oauth/endpoints/revoke.js +97 -0
- package/dist/src/oauth/endpoints/revoke.js.map +1 -0
- package/dist/src/oauth/endpoints/token.js +136 -62
- package/dist/src/oauth/endpoints/token.js.map +1 -1
- package/dist/src/oauth/gitlab-device-flow.d.ts +27 -8
- package/dist/src/oauth/gitlab-device-flow.js +119 -57
- package/dist/src/oauth/gitlab-device-flow.js.map +1 -1
- package/dist/src/oauth/gitlab-request-bound.d.ts +1 -0
- package/dist/src/oauth/gitlab-request-bound.js +6 -0
- package/dist/src/oauth/gitlab-request-bound.js.map +1 -0
- package/dist/src/oauth/gitlab-token-refresh.d.ts +6 -0
- package/dist/src/oauth/gitlab-token-refresh.js +130 -0
- package/dist/src/oauth/gitlab-token-refresh.js.map +1 -0
- package/dist/src/oauth/granted-scopes.d.ts +1 -0
- package/dist/src/oauth/granted-scopes.js +7 -0
- package/dist/src/oauth/granted-scopes.js.map +1 -0
- package/dist/src/oauth/index.d.ts +2 -2
- package/dist/src/oauth/index.js +4 -2
- package/dist/src/oauth/index.js.map +1 -1
- package/dist/src/oauth/instance-app.d.ts +4 -0
- package/dist/src/oauth/instance-app.js +45 -0
- package/dist/src/oauth/instance-app.js.map +1 -0
- package/dist/src/oauth/issued-tokens.d.ts +1 -0
- package/dist/src/oauth/issued-tokens.js +24 -0
- package/dist/src/oauth/issued-tokens.js.map +1 -0
- package/dist/src/oauth/oauth-app.d.ts +9 -0
- package/dist/src/oauth/oauth-app.js +14 -0
- package/dist/src/oauth/oauth-app.js.map +1 -0
- package/dist/src/oauth/request-params.d.ts +1 -0
- package/dist/src/oauth/request-params.js +17 -0
- package/dist/src/oauth/request-params.js.map +1 -0
- package/dist/src/oauth/resource.d.ts +12 -0
- package/dist/src/oauth/resource.js +66 -0
- package/dist/src/oauth/resource.js.map +1 -0
- package/dist/src/oauth/routes.d.ts +2 -0
- package/dist/src/oauth/routes.js +31 -0
- package/dist/src/oauth/routes.js.map +1 -0
- package/dist/src/oauth/session-store.d.ts +44 -36
- package/dist/src/oauth/session-store.js +125 -253
- package/dist/src/oauth/session-store.js.map +1 -1
- package/dist/src/oauth/storage/factory.js +1 -1
- package/dist/src/oauth/storage/factory.js.map +1 -1
- package/dist/src/oauth/storage/file.d.ts +23 -1
- package/dist/src/oauth/storage/file.js +168 -36
- package/dist/src/oauth/storage/file.js.map +1 -1
- package/dist/src/oauth/storage/memory.d.ts +23 -1
- package/dist/src/oauth/storage/memory.js +120 -22
- package/dist/src/oauth/storage/memory.js.map +1 -1
- package/dist/src/oauth/storage/types.d.ts +17 -1
- package/dist/src/oauth/storage/types.js.map +1 -1
- package/dist/src/oauth/tool-auth.d.ts +12 -0
- package/dist/src/oauth/tool-auth.js +108 -0
- package/dist/src/oauth/tool-auth.js.map +1 -0
- package/dist/src/oauth/types.d.ts +30 -0
- package/dist/src/profiles/scope-enforcer.d.ts +8 -0
- package/dist/src/profiles/scope-enforcer.js +86 -24
- package/dist/src/profiles/scope-enforcer.js.map +1 -1
- package/dist/src/profiles/types.js +4 -1
- package/dist/src/profiles/types.js.map +1 -1
- package/dist/src/registry-manager.d.ts +16 -4
- package/dist/src/registry-manager.js +115 -33
- package/dist/src/registry-manager.js.map +1 -1
- package/dist/src/server.js +66 -39
- package/dist/src/server.js.map +1 -1
- package/dist/src/services/ConnectionManager.d.ts +2 -1
- package/dist/src/services/ConnectionManager.js +26 -19
- package/dist/src/services/ConnectionManager.js.map +1 -1
- package/dist/src/services/TokenScopeDetector.d.ts +5 -1
- package/dist/src/services/TokenScopeDetector.js +19 -0
- package/dist/src/services/TokenScopeDetector.js.map +1 -1
- package/dist/src/session-manager.d.ts +3 -1
- package/dist/src/session-manager.js +35 -10
- package/dist/src/session-manager.js.map +1 -1
- package/dist/src/types.d.ts +3 -2
- package/dist/src/types.js.map +1 -1
- package/dist/src/utils/bounded-map.d.ts +1 -0
- package/dist/src/utils/bounded-map.js +23 -0
- package/dist/src/utils/bounded-map.js.map +1 -0
- package/dist/src/utils/fetch.d.ts +0 -1
- package/dist/src/utils/fetch.js +2 -12
- package/dist/src/utils/fetch.js.map +1 -1
- package/dist/src/utils/gitlab-api.js +2 -1
- package/dist/src/utils/gitlab-api.js.map +1 -1
- package/dist/src/utils/gitlab-base-url.d.ts +2 -0
- package/dist/src/utils/gitlab-base-url.js +30 -0
- package/dist/src/utils/gitlab-base-url.js.map +1 -0
- package/dist/src/utils/html.d.ts +1 -0
- package/dist/src/utils/html.js +12 -0
- package/dist/src/utils/html.js.map +1 -0
- package/dist/src/utils/namespace.d.ts +1 -0
- package/dist/src/utils/namespace.js +72 -24
- package/dist/src/utils/namespace.js.map +1 -1
- package/dist/src/utils/schema-utils.d.ts +5 -3
- package/dist/src/utils/schema-utils.js +50 -22
- package/dist/src/utils/schema-utils.js.map +1 -1
- package/dist/src/utils/smart-user-search.js +2 -1
- package/dist/src/utils/smart-user-search.js.map +1 -1
- package/dist/src/utils/sync-directory.d.ts +1 -0
- package/dist/src/utils/sync-directory.js +49 -0
- package/dist/src/utils/sync-directory.js.map +1 -0
- package/dist/src/utils/tool-result.d.ts +4 -0
- package/dist/src/utils/tool-result.js +41 -0
- package/dist/src/utils/tool-result.js.map +1 -0
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +65 -18
- package/skills/gitlab-ci/SKILL.md +16 -0
- package/skills/gitlab-discovery/SKILL.md +15 -0
- package/skills/gitlab-review/SKILL.md +16 -0
- package/skills/gitlab-setup/SKILL.md +16 -0
- package/skills/gitlab-work-items/SKILL.md +16 -0
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import { OAuthSession, DeviceFlowState, AuthCodeFlowState, AuthorizationCode } from '../types';
|
|
1
|
+
import { OAuthSession, DeviceFlowState, AuthCodeFlowState, AuthorizationCode, RegisteredOAuthClient } from '../types';
|
|
2
|
+
import type { AccountSettings, AccountSettingsRecord } from '../../configuration/types';
|
|
2
3
|
export interface SessionStorageBackend {
|
|
3
4
|
readonly type: 'memory' | 'file' | 'postgresql' | 'redis';
|
|
4
5
|
createSession(session: OAuthSession): Promise<void>;
|
|
@@ -21,6 +22,19 @@ export interface SessionStorageBackend {
|
|
|
21
22
|
associateMcpSession(mcpSessionId: string, oauthSessionId: string): Promise<void>;
|
|
22
23
|
getSessionByMcpSessionId(mcpSessionId: string): Promise<OAuthSession | undefined>;
|
|
23
24
|
removeMcpSessionAssociation(mcpSessionId: string): Promise<boolean>;
|
|
25
|
+
storeClient(client: RegisteredOAuthClient): Promise<void>;
|
|
26
|
+
getClient(clientId: string): Promise<RegisteredOAuthClient | undefined>;
|
|
27
|
+
markClientUsed(clientId: string): Promise<void>;
|
|
28
|
+
countClientsRegisteredSince(registeredFrom: string, since: number): Promise<number>;
|
|
29
|
+
consumeAuthCode(code: string): Promise<AuthorizationCode | undefined>;
|
|
30
|
+
consumeAuthCodeFlow(internalState: string): Promise<AuthCodeFlowState | undefined>;
|
|
31
|
+
consumeDeviceFlow(state: string): Promise<DeviceFlowState | undefined>;
|
|
32
|
+
claimDevicePoll(state: string, now: number, nextPollAt: number): Promise<DeviceFlowState | undefined>;
|
|
33
|
+
claimGitLabRefresh(sessionId: string, expectedRefreshToken: string, now: number, leaseUntil: number): Promise<boolean>;
|
|
34
|
+
releaseGitLabRefresh(sessionId: string, leaseUntil: number): Promise<void>;
|
|
35
|
+
rotateSession(sessionId: string, expectedRefreshToken: string, updates: Partial<OAuthSession>): Promise<boolean>;
|
|
36
|
+
getAccountSettings(accountKey: string): Promise<AccountSettingsRecord | undefined>;
|
|
37
|
+
putAccountSettings(accountKey: string, settings: AccountSettings, expectedVersion: number): Promise<AccountSettingsRecord | undefined>;
|
|
24
38
|
initialize(): Promise<void>;
|
|
25
39
|
cleanup(): Promise<void>;
|
|
26
40
|
close(): Promise<void>;
|
|
@@ -62,5 +76,7 @@ export interface StorageData {
|
|
|
62
76
|
mcpSessionId: string;
|
|
63
77
|
oauthSessionId: string;
|
|
64
78
|
}>;
|
|
79
|
+
clients?: RegisteredOAuthClient[];
|
|
80
|
+
accountSettings?: AccountSettingsRecord[];
|
|
65
81
|
}
|
|
66
82
|
export declare const STORAGE_DATA_VERSION = 1;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../src/oauth/storage/types.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../src/oauth/storage/types.ts"],"names":[],"mappings":";;;AAiMa,QAAA,oBAAoB,GAAG,CAAC,CAAC"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import { McpError, type CallToolResult } from '@modelcontextprotocol/sdk/types.js';
|
|
2
|
+
export interface OAuthSecurityScheme {
|
|
3
|
+
type: 'oauth2';
|
|
4
|
+
scopes: string[];
|
|
5
|
+
}
|
|
6
|
+
export declare const OAUTH_SECURITY_SCHEMES: readonly OAuthSecurityScheme[];
|
|
7
|
+
export declare const APP_PANEL_SECURITY_SCHEMES: readonly OAuthSecurityScheme[];
|
|
8
|
+
export declare function resourceScopeRejection(): McpError | undefined;
|
|
9
|
+
export declare function toolScopeRejection(): CallToolResult | undefined;
|
|
10
|
+
export declare function isGitLabAuthFailure(error: unknown): boolean;
|
|
11
|
+
export declare function isGitLabInsufficientScope(error: unknown): boolean;
|
|
12
|
+
export declare function withReauthChallenge(result: CallToolResult, error: unknown): CallToolResult;
|
|
@@ -0,0 +1,108 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.APP_PANEL_SECURITY_SCHEMES = exports.OAUTH_SECURITY_SCHEMES = void 0;
|
|
4
|
+
exports.resourceScopeRejection = resourceScopeRejection;
|
|
5
|
+
exports.toolScopeRejection = toolScopeRejection;
|
|
6
|
+
exports.isGitLabAuthFailure = isGitLabAuthFailure;
|
|
7
|
+
exports.isGitLabInsufficientScope = isGitLabInsufficientScope;
|
|
8
|
+
exports.withReauthChallenge = withReauthChallenge;
|
|
9
|
+
const types_js_1 = require("@modelcontextprotocol/sdk/types.js");
|
|
10
|
+
const config_1 = require("./config");
|
|
11
|
+
const token_context_1 = require("./token-context");
|
|
12
|
+
const resource_1 = require("./resource");
|
|
13
|
+
const error_handler_1 = require("../utils/error-handler");
|
|
14
|
+
exports.OAUTH_SECURITY_SCHEMES = [
|
|
15
|
+
{ type: 'oauth2', scopes: ['mcp:tools'] },
|
|
16
|
+
];
|
|
17
|
+
const TOOL_SCOPE = exports.OAUTH_SECURITY_SCHEMES[0].scopes[0];
|
|
18
|
+
const RESOURCE_SCOPE = 'mcp:resources';
|
|
19
|
+
exports.APP_PANEL_SECURITY_SCHEMES = [
|
|
20
|
+
{ type: 'oauth2', scopes: [TOOL_SCOPE, RESOURCE_SCOPE] },
|
|
21
|
+
];
|
|
22
|
+
function resourceScopeRejection() {
|
|
23
|
+
const config = (0, config_1.loadOAuthConfig)();
|
|
24
|
+
const context = (0, token_context_1.getTokenContext)();
|
|
25
|
+
if (!config || !context?.mcpScopes || context.mcpScopes.includes(RESOURCE_SCOPE)) {
|
|
26
|
+
return undefined;
|
|
27
|
+
}
|
|
28
|
+
const resource = context.resource ?? (0, resource_1.defaultResource)(config.issuer);
|
|
29
|
+
const challenge = `Bearer resource_metadata="${(0, resource_1.resourceMetadataUrl)(resource)}", ` +
|
|
30
|
+
`error="insufficient_scope", scope="${RESOURCE_SCOPE}", ` +
|
|
31
|
+
`error_description="This access token does not allow resource reads; reconnect to grant ${RESOURCE_SCOPE}"`;
|
|
32
|
+
return new types_js_1.McpError(types_js_1.ErrorCode.InvalidRequest, `insufficient_scope: the access token was not granted ${RESOURCE_SCOPE}`, { 'mcp/www_authenticate': [challenge] });
|
|
33
|
+
}
|
|
34
|
+
function toolScopeRejection() {
|
|
35
|
+
const config = (0, config_1.loadOAuthConfig)();
|
|
36
|
+
const context = (0, token_context_1.getTokenContext)();
|
|
37
|
+
if (!config || !context?.mcpScopes || context.mcpScopes.includes(TOOL_SCOPE)) {
|
|
38
|
+
return undefined;
|
|
39
|
+
}
|
|
40
|
+
const resource = context.resource ?? (0, resource_1.defaultResource)(config.issuer);
|
|
41
|
+
const challenge = `Bearer resource_metadata="${(0, resource_1.resourceMetadataUrl)(resource)}", ` +
|
|
42
|
+
`error="insufficient_scope", scope="${TOOL_SCOPE}", ` +
|
|
43
|
+
`error_description="This access token does not allow tool calls; reconnect to grant ${TOOL_SCOPE}"`;
|
|
44
|
+
return {
|
|
45
|
+
content: [
|
|
46
|
+
{
|
|
47
|
+
type: 'text',
|
|
48
|
+
text: JSON.stringify({
|
|
49
|
+
error: 'insufficient_scope',
|
|
50
|
+
message: `The access token was not granted ${TOOL_SCOPE}`,
|
|
51
|
+
}),
|
|
52
|
+
},
|
|
53
|
+
],
|
|
54
|
+
isError: true,
|
|
55
|
+
_meta: { 'mcp/www_authenticate': [challenge] },
|
|
56
|
+
};
|
|
57
|
+
}
|
|
58
|
+
const MAX_CAUSE_DEPTH = 8;
|
|
59
|
+
function isGitLabAuthFailure(error) {
|
|
60
|
+
let current = error;
|
|
61
|
+
for (let depth = 0; depth < MAX_CAUSE_DEPTH && current instanceof Error; depth++) {
|
|
62
|
+
if ((0, error_handler_1.isStructuredToolError)(current)) {
|
|
63
|
+
const status = current.structuredError.http_status;
|
|
64
|
+
if (status === 401)
|
|
65
|
+
return true;
|
|
66
|
+
}
|
|
67
|
+
if ((0, error_handler_1.parseGitLabApiError)(current.message)?.status === 401)
|
|
68
|
+
return true;
|
|
69
|
+
current = current.cause;
|
|
70
|
+
}
|
|
71
|
+
return false;
|
|
72
|
+
}
|
|
73
|
+
function isGitLabInsufficientScope(error) {
|
|
74
|
+
let current = error;
|
|
75
|
+
for (let depth = 0; depth < MAX_CAUSE_DEPTH && current instanceof Error; depth++) {
|
|
76
|
+
const parsed = (0, error_handler_1.parseGitLabApiError)(current.message);
|
|
77
|
+
if (parsed?.status === 403 && parsed.message.includes('insufficient_scope'))
|
|
78
|
+
return true;
|
|
79
|
+
current = current.cause;
|
|
80
|
+
}
|
|
81
|
+
return false;
|
|
82
|
+
}
|
|
83
|
+
function withReauthChallenge(result, error) {
|
|
84
|
+
const config = (0, config_1.loadOAuthConfig)();
|
|
85
|
+
if (!config)
|
|
86
|
+
return result;
|
|
87
|
+
let errorParams;
|
|
88
|
+
if (isGitLabAuthFailure(error)) {
|
|
89
|
+
errorParams =
|
|
90
|
+
'error="invalid_token", error_description="GitLab no longer accepts this account\'s authorization; reconnect the GitLab account"';
|
|
91
|
+
}
|
|
92
|
+
else if (isGitLabInsufficientScope(error)) {
|
|
93
|
+
errorParams =
|
|
94
|
+
`error="insufficient_scope", scope="${exports.OAUTH_SECURITY_SCHEMES[0].scopes.join(' ')}", ` +
|
|
95
|
+
'error_description="The GitLab authorization lacks a scope this action needs; reconnect the GitLab account to grant it"';
|
|
96
|
+
}
|
|
97
|
+
else {
|
|
98
|
+
return result;
|
|
99
|
+
}
|
|
100
|
+
const resource = (0, token_context_1.getTokenContext)()?.resource ?? (0, resource_1.defaultResource)(config.issuer);
|
|
101
|
+
const challenge = `Bearer resource_metadata="${(0, resource_1.resourceMetadataUrl)(resource)}", ${errorParams}`;
|
|
102
|
+
return {
|
|
103
|
+
...result,
|
|
104
|
+
isError: true,
|
|
105
|
+
_meta: { ...result._meta, 'mcp/www_authenticate': [challenge] },
|
|
106
|
+
};
|
|
107
|
+
}
|
|
108
|
+
//# sourceMappingURL=tool-auth.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tool-auth.js","sourceRoot":"","sources":["../../../src/oauth/tool-auth.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,16 +11,31 @@ export interface OAuthSession {
|
|
|
11
11
|
gitlabAccessToken: string;
|
|
12
12
|
gitlabRefreshToken: string;
|
|
13
13
|
gitlabTokenExpiry: number;
|
|
14
|
+
gitlabScopes?: string[];
|
|
14
15
|
gitlabUserId: number;
|
|
15
16
|
gitlabUsername: string;
|
|
16
17
|
gitlabApiUrl?: string;
|
|
17
18
|
instanceLabel?: string;
|
|
18
19
|
clientId: string;
|
|
19
20
|
scopes: string[];
|
|
21
|
+
resource?: string;
|
|
20
22
|
createdAt: number;
|
|
21
23
|
updatedAt: number;
|
|
22
24
|
}
|
|
25
|
+
export interface RegisteredOAuthClient {
|
|
26
|
+
clientId: string;
|
|
27
|
+
clientSecret?: string;
|
|
28
|
+
redirectUris: string[];
|
|
29
|
+
clientName?: string;
|
|
30
|
+
tokenEndpointAuthMethod: string;
|
|
31
|
+
grantTypes: string[];
|
|
32
|
+
responseTypes: string[];
|
|
33
|
+
createdAt: number;
|
|
34
|
+
registeredFrom?: string;
|
|
35
|
+
expiresAt?: number;
|
|
36
|
+
}
|
|
23
37
|
export interface AuthCodeFlowState {
|
|
38
|
+
requestedGitlabScopes?: string[];
|
|
24
39
|
clientId: string;
|
|
25
40
|
codeChallenge: string;
|
|
26
41
|
codeChallengeMethod: string;
|
|
@@ -31,14 +46,19 @@ export interface AuthCodeFlowState {
|
|
|
31
46
|
expiresAt: number;
|
|
32
47
|
selectedInstance?: string;
|
|
33
48
|
selectedInstanceLabel?: string;
|
|
49
|
+
scopes?: string[];
|
|
50
|
+
resource?: string;
|
|
51
|
+
gitlabTokens?: GitLabTokenResponse;
|
|
34
52
|
}
|
|
35
53
|
export interface DeviceFlowState {
|
|
54
|
+
requestedGitlabScopes?: string[];
|
|
36
55
|
deviceCode: string;
|
|
37
56
|
userCode: string;
|
|
38
57
|
verificationUri: string;
|
|
39
58
|
verificationUriComplete?: string;
|
|
40
59
|
expiresAt: number;
|
|
41
60
|
interval: number;
|
|
61
|
+
nextPollAt?: number;
|
|
42
62
|
clientId: string;
|
|
43
63
|
codeChallenge: string;
|
|
44
64
|
codeChallengeMethod: string;
|
|
@@ -46,6 +66,9 @@ export interface DeviceFlowState {
|
|
|
46
66
|
redirectUri?: string;
|
|
47
67
|
selectedInstance?: string;
|
|
48
68
|
selectedInstanceLabel?: string;
|
|
69
|
+
scopes?: string[];
|
|
70
|
+
resource?: string;
|
|
71
|
+
gitlabTokens?: GitLabTokenResponse;
|
|
49
72
|
}
|
|
50
73
|
export interface AuthorizationCode {
|
|
51
74
|
code: string;
|
|
@@ -73,12 +96,15 @@ export interface GitLabDeviceResponse {
|
|
|
73
96
|
interval: number;
|
|
74
97
|
}
|
|
75
98
|
export interface TokenContext {
|
|
99
|
+
gitlabScopes?: readonly string[];
|
|
76
100
|
gitlabToken: string;
|
|
77
101
|
gitlabUserId: number;
|
|
78
102
|
gitlabUsername: string;
|
|
79
103
|
sessionId: string;
|
|
80
104
|
apiUrl: string;
|
|
81
105
|
instanceLabel?: string;
|
|
106
|
+
resource?: string;
|
|
107
|
+
mcpScopes?: readonly string[];
|
|
82
108
|
}
|
|
83
109
|
export interface GitLabUserInfo {
|
|
84
110
|
id: number;
|
|
@@ -103,12 +129,16 @@ export interface DeviceFlowPollResponse {
|
|
|
103
129
|
redirect_uri?: string;
|
|
104
130
|
code?: string;
|
|
105
131
|
state?: string;
|
|
132
|
+
iss?: string;
|
|
133
|
+
interval?: number;
|
|
106
134
|
error?: string;
|
|
107
135
|
}
|
|
108
136
|
export interface MCPTokenPayload {
|
|
109
137
|
iss: string;
|
|
110
138
|
sub: string;
|
|
111
139
|
aud: string;
|
|
140
|
+
client_id?: string;
|
|
141
|
+
jti?: string;
|
|
112
142
|
sid: string;
|
|
113
143
|
scope: string;
|
|
114
144
|
gitlab_user: string;
|
|
@@ -5,6 +5,7 @@ export declare class ScopeViolationError extends Error {
|
|
|
5
5
|
readonly allowedScope: ScopeConfig;
|
|
6
6
|
constructor(attemptedTarget: string, allowedScope: ScopeConfig);
|
|
7
7
|
}
|
|
8
|
+
export declare function decodePath(path: string): string;
|
|
8
9
|
export declare function isInNamespace(projectPath: string, namespace: string): boolean;
|
|
9
10
|
export declare class ScopeEnforcer {
|
|
10
11
|
private readonly scope;
|
|
@@ -17,6 +18,7 @@ export declare class ScopeEnforcer {
|
|
|
17
18
|
isGroupAllowed(groupPath: string): boolean;
|
|
18
19
|
enforce(projectPath: string): void;
|
|
19
20
|
enforceGroup(groupPath: string): void;
|
|
21
|
+
listsId(id: string, kind: NumericTargetKind): boolean;
|
|
20
22
|
getScope(): ScopeConfig;
|
|
21
23
|
getScopeDescription(): string;
|
|
22
24
|
hasProjectRestrictions(): boolean;
|
|
@@ -25,4 +27,10 @@ export declare class ScopeEnforcer {
|
|
|
25
27
|
}
|
|
26
28
|
export declare function extractProjectsFromArgs(args: Record<string, unknown>): string[];
|
|
27
29
|
export declare function extractGroupsFromArgs(args: Record<string, unknown>): string[];
|
|
30
|
+
export type NumericTargetKind = 'project' | 'group' | 'either';
|
|
31
|
+
export declare function numericTargets(args: Record<string, unknown>): Array<{
|
|
32
|
+
field: string;
|
|
33
|
+
id: string;
|
|
34
|
+
kind: NumericTargetKind;
|
|
35
|
+
}>;
|
|
28
36
|
export declare function enforceArgsScope(enforcer: ScopeEnforcer, args: Record<string, unknown>): void;
|
|
@@ -1,9 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.ScopeEnforcer = exports.ScopeViolationError = void 0;
|
|
4
|
+
exports.decodePath = decodePath;
|
|
4
5
|
exports.isInNamespace = isInNamespace;
|
|
5
6
|
exports.extractProjectsFromArgs = extractProjectsFromArgs;
|
|
6
7
|
exports.extractGroupsFromArgs = extractGroupsFromArgs;
|
|
8
|
+
exports.numericTargets = numericTargets;
|
|
7
9
|
exports.enforceArgsScope = enforceArgsScope;
|
|
8
10
|
const logger_1 = require("../logger");
|
|
9
11
|
class ScopeViolationError extends Error {
|
|
@@ -49,12 +51,31 @@ function getScopeDescription(scope) {
|
|
|
49
51
|
return parts.length > 0 ? parts.join('; ') : 'unrestricted';
|
|
50
52
|
}
|
|
51
53
|
function normalizeProjectPath(path) {
|
|
52
|
-
const trimmed = path.trim()
|
|
54
|
+
const trimmed = trimSlashes(decodePath(path.trim()));
|
|
53
55
|
if (/^\d+$/.test(trimmed)) {
|
|
54
56
|
return trimmed;
|
|
55
57
|
}
|
|
56
58
|
return trimmed.toLowerCase();
|
|
57
59
|
}
|
|
60
|
+
function trimSlashes(path) {
|
|
61
|
+
let start = 0;
|
|
62
|
+
let end = path.length;
|
|
63
|
+
while (start < end && path[start] === '/')
|
|
64
|
+
start++;
|
|
65
|
+
while (end > start && path[end - 1] === '/')
|
|
66
|
+
end--;
|
|
67
|
+
return path.slice(start, end);
|
|
68
|
+
}
|
|
69
|
+
function decodePath(path) {
|
|
70
|
+
if (!path.includes('%'))
|
|
71
|
+
return path;
|
|
72
|
+
try {
|
|
73
|
+
return decodeURIComponent(path);
|
|
74
|
+
}
|
|
75
|
+
catch {
|
|
76
|
+
return path;
|
|
77
|
+
}
|
|
78
|
+
}
|
|
58
79
|
function isInNamespace(projectPath, namespace) {
|
|
59
80
|
const normalizedProject = normalizeProjectPath(projectPath);
|
|
60
81
|
const normalizedNamespace = normalizeProjectPath(namespace);
|
|
@@ -129,7 +150,7 @@ class ScopeEnforcer {
|
|
|
129
150
|
}
|
|
130
151
|
isGroupAllowed(groupPath) {
|
|
131
152
|
if (!this.hasGroupRestrictions()) {
|
|
132
|
-
return
|
|
153
|
+
return !this.hasProjectRestrictions();
|
|
133
154
|
}
|
|
134
155
|
const normalized = normalizeProjectPath(groupPath);
|
|
135
156
|
if (this.allowedGroupsSet.size > 0 && this.allowedGroupsSet.has(normalized)) {
|
|
@@ -169,6 +190,10 @@ class ScopeEnforcer {
|
|
|
169
190
|
throw new ScopeViolationError(groupPath, this.scope);
|
|
170
191
|
}
|
|
171
192
|
}
|
|
193
|
+
listsId(id, kind) {
|
|
194
|
+
return ((kind !== 'group' && this.allowedProjectsSet.has(id)) ||
|
|
195
|
+
(kind !== 'project' && this.allowedGroupsSet.has(id)));
|
|
196
|
+
}
|
|
172
197
|
getScope() {
|
|
173
198
|
return this.scope;
|
|
174
199
|
}
|
|
@@ -194,39 +219,76 @@ class ScopeEnforcer {
|
|
|
194
219
|
}
|
|
195
220
|
}
|
|
196
221
|
exports.ScopeEnforcer = ScopeEnforcer;
|
|
222
|
+
function identifierOf(value) {
|
|
223
|
+
if (typeof value === 'number' && Number.isFinite(value))
|
|
224
|
+
return String(value);
|
|
225
|
+
if (typeof value === 'string' && value.trim())
|
|
226
|
+
return value.trim();
|
|
227
|
+
return undefined;
|
|
228
|
+
}
|
|
229
|
+
const PROJECT_FIELDS = [
|
|
230
|
+
'project_id',
|
|
231
|
+
'projectId',
|
|
232
|
+
'project',
|
|
233
|
+
'namespace',
|
|
234
|
+
'namespacePath',
|
|
235
|
+
'fullPath',
|
|
236
|
+
'target_project_id',
|
|
237
|
+
];
|
|
238
|
+
const PROJECT_OR_GROUP_FIELDS = new Set([
|
|
239
|
+
'namespace',
|
|
240
|
+
'namespacePath',
|
|
241
|
+
'fullPath',
|
|
242
|
+
]);
|
|
243
|
+
const GROUP_FIELDS = [
|
|
244
|
+
'group_id',
|
|
245
|
+
'groupId',
|
|
246
|
+
'group',
|
|
247
|
+
'target_group_id',
|
|
248
|
+
'parent_id',
|
|
249
|
+
'namespace_path',
|
|
250
|
+
'namespace_id',
|
|
251
|
+
];
|
|
197
252
|
function extractProjectsFromArgs(args) {
|
|
198
253
|
const projects = [];
|
|
199
|
-
const
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
'namespace',
|
|
204
|
-
'namespacePath',
|
|
205
|
-
'fullPath',
|
|
206
|
-
];
|
|
207
|
-
for (const field of projectFields) {
|
|
208
|
-
const value = args[field];
|
|
209
|
-
if (typeof value === 'string' && value.trim()) {
|
|
210
|
-
projects.push(value.trim());
|
|
211
|
-
}
|
|
254
|
+
for (const field of PROJECT_FIELDS) {
|
|
255
|
+
const id = identifierOf(args[field]);
|
|
256
|
+
if (id)
|
|
257
|
+
projects.push(id);
|
|
212
258
|
}
|
|
213
259
|
return projects;
|
|
214
260
|
}
|
|
215
261
|
function extractGroupsFromArgs(args) {
|
|
216
262
|
const groups = [];
|
|
217
|
-
const
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
groups.push(value.trim());
|
|
222
|
-
}
|
|
263
|
+
for (const field of GROUP_FIELDS) {
|
|
264
|
+
const id = identifierOf(args[field]);
|
|
265
|
+
if (id)
|
|
266
|
+
groups.push(id);
|
|
223
267
|
}
|
|
224
268
|
return groups;
|
|
225
269
|
}
|
|
270
|
+
function numericTargets(args) {
|
|
271
|
+
const found = [];
|
|
272
|
+
const add = (field, kind) => {
|
|
273
|
+
const id = identifierOf(args[field]);
|
|
274
|
+
if (id && /^\d+$/.test(id))
|
|
275
|
+
found.push({ field, id, kind });
|
|
276
|
+
};
|
|
277
|
+
for (const field of PROJECT_FIELDS) {
|
|
278
|
+
add(field, PROJECT_OR_GROUP_FIELDS.has(field) ? 'either' : 'project');
|
|
279
|
+
}
|
|
280
|
+
for (const field of GROUP_FIELDS)
|
|
281
|
+
add(field, 'group');
|
|
282
|
+
return found;
|
|
283
|
+
}
|
|
226
284
|
function enforceArgsScope(enforcer, args) {
|
|
227
|
-
const
|
|
228
|
-
|
|
229
|
-
|
|
285
|
+
for (const field of PROJECT_FIELDS) {
|
|
286
|
+
const id = identifierOf(args[field]);
|
|
287
|
+
if (!id)
|
|
288
|
+
continue;
|
|
289
|
+
if (PROJECT_OR_GROUP_FIELDS.has(field) && enforcer.isGroupAllowed(id))
|
|
290
|
+
continue;
|
|
291
|
+
enforcer.enforce(id);
|
|
230
292
|
}
|
|
231
293
|
const groups = extractGroupsFromArgs(args);
|
|
232
294
|
for (const group of groups) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scope-enforcer.js","sourceRoot":"","sources":["../../../src/profiles/scope-enforcer.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"scope-enforcer.js","sourceRoot":"","sources":["../../../src/profiles/scope-enforcer.ts"],"names":[],"mappings":"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"}
|
|
@@ -118,7 +118,10 @@ exports.PresetSchema = zod_1.z
|
|
|
118
118
|
description: zod_1.z.string().optional().describe('Human-readable description of the preset'),
|
|
119
119
|
read_only: zod_1.z.boolean().optional().describe('Enable read-only mode'),
|
|
120
120
|
denied_tools_regex: zod_1.z.string().optional().describe('Regex pattern to exclude tools'),
|
|
121
|
-
allowed_tools: zod_1.z
|
|
121
|
+
allowed_tools: zod_1.z
|
|
122
|
+
.array(zod_1.z.string())
|
|
123
|
+
.optional()
|
|
124
|
+
.describe('Explicit tool whitelist (overrides denied_tools_regex)'),
|
|
122
125
|
denied_actions: zod_1.z
|
|
123
126
|
.array(zod_1.z.string())
|
|
124
127
|
.optional()
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/profiles/types.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/profiles/types.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
import { EnhancedToolDefinition, ToolDefinition } from './types';
|
|
2
|
+
import { type ClientSchemaMode } from './utils/schema-utils';
|
|
3
|
+
import type { ToolFacts } from './configuration/policy';
|
|
2
4
|
declare class RegistryManager {
|
|
3
5
|
private static instance;
|
|
4
6
|
private registries;
|
|
@@ -9,12 +11,19 @@ declare class RegistryManager {
|
|
|
9
11
|
private readonly verifiedContextUrls;
|
|
10
12
|
private descriptionOverrides;
|
|
11
13
|
private readOnlyToolsCache;
|
|
14
|
+
private readOnlyToolSet;
|
|
15
|
+
private toolRegistryKeys;
|
|
12
16
|
private constructor();
|
|
13
17
|
static getInstance(): RegistryManager;
|
|
14
18
|
private initializeRegistries;
|
|
15
19
|
private loadDescriptionOverrides;
|
|
16
20
|
private buildReadOnlyToolsList;
|
|
17
21
|
private getReadOnlyTools;
|
|
22
|
+
isReadOnlyTool(toolName: string): boolean;
|
|
23
|
+
getToolFacts(toolName: string): ToolFacts;
|
|
24
|
+
getDeclaredArguments(toolName: string, action?: string): ReadonlySet<string> | undefined;
|
|
25
|
+
getRegistryKeys(): string[];
|
|
26
|
+
getToolRegistryKey(toolName: string): string | undefined;
|
|
18
27
|
private loadInstanceContext;
|
|
19
28
|
private getToolExclusionReason;
|
|
20
29
|
private unavailableActionsFor;
|
|
@@ -24,11 +33,13 @@ declare class RegistryManager {
|
|
|
24
33
|
private resolveCache;
|
|
25
34
|
private buildToolLookupCache;
|
|
26
35
|
private invalidateCaches;
|
|
27
|
-
getTool(toolName: string, instanceUrl?: string): EnhancedToolDefinition | null;
|
|
28
|
-
executeTool(toolName: string, args: unknown, instanceUrl?: string): Promise<unknown>;
|
|
36
|
+
getTool(toolName: string, instanceUrl?: string, scopes?: readonly string[]): EnhancedToolDefinition | null;
|
|
37
|
+
executeTool(toolName: string, args: unknown, instanceUrl?: string, scopes?: readonly string[]): Promise<unknown>;
|
|
29
38
|
refreshCache(instanceUrl?: string): void;
|
|
30
|
-
getAllToolDefinitions(instanceUrl?: string): ToolDefinition[];
|
|
31
|
-
|
|
39
|
+
getAllToolDefinitions(instanceUrl?: string, mode?: ClientSchemaMode, scopes?: readonly string[]): ToolDefinition[];
|
|
40
|
+
private forScopes;
|
|
41
|
+
getToolCatalog(instanceUrl?: string, mode?: ClientSchemaMode): ToolDefinition[];
|
|
42
|
+
private toToolDefinition;
|
|
32
43
|
getAllToolDefinitionsTierless(): EnhancedToolDefinition[];
|
|
33
44
|
getAllToolDefinitionsUnfiltered(): EnhancedToolDefinition[];
|
|
34
45
|
hasToolHandler(toolName: string, instanceUrl?: string): boolean;
|
|
@@ -36,6 +47,7 @@ declare class RegistryManager {
|
|
|
36
47
|
private isUnreachableFor;
|
|
37
48
|
private aggregateFilterCounters;
|
|
38
49
|
getFilterStats(instanceUrl?: string): FilterStats;
|
|
50
|
+
private countCatalogTools;
|
|
39
51
|
}
|
|
40
52
|
export interface FilterStats {
|
|
41
53
|
available: number;
|