@structured-world/gitlab-mcp 11.0.0 → 12.0.1
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 +4 -4
- package/README.md.in +1 -1
- package/dist/src/accounts/chat-accounts.d.ts +17 -0
- package/dist/src/accounts/chat-accounts.js +245 -0
- package/dist/src/accounts/chat-accounts.js.map +1 -0
- package/dist/src/accounts/instance-tokens.d.ts +2 -0
- package/dist/src/accounts/instance-tokens.js +43 -0
- package/dist/src/accounts/instance-tokens.js.map +1 -0
- package/dist/src/accounts/link.d.ts +16 -0
- package/dist/src/accounts/link.js +469 -0
- package/dist/src/accounts/link.js.map +1 -0
- package/dist/src/accounts/token-account.d.ts +6 -0
- package/dist/src/accounts/token-account.js +13 -0
- package/dist/src/accounts/token-account.js.map +1 -0
- package/dist/src/cli/init/config-generator.d.ts +3 -2
- package/dist/src/cli/init/config-generator.js +15 -0
- package/dist/src/cli/init/config-generator.js.map +1 -1
- package/dist/src/cli/init/types.d.ts +7 -2
- package/dist/src/cli/init/types.js +9 -0
- package/dist/src/cli/init/types.js.map +1 -1
- package/dist/src/cli/init/wizard.js +31 -1
- package/dist/src/cli/init/wizard.js.map +1 -1
- package/dist/src/cli/install/codex.d.ts +25 -0
- package/dist/src/cli/install/codex.js +261 -0
- package/dist/src/cli/install/codex.js.map +1 -0
- package/dist/src/cli/install/detector.js +22 -0
- package/dist/src/cli/install/detector.js.map +1 -1
- package/dist/src/cli/install/index.d.ts +2 -1
- package/dist/src/cli/install/index.js +3 -1
- package/dist/src/cli/install/index.js.map +1 -1
- package/dist/src/cli/install/install-command.d.ts +5 -2
- package/dist/src/cli/install/install-command.js +52 -8
- package/dist/src/cli/install/install-command.js.map +1 -1
- package/dist/src/cli/install/installers.d.ts +8 -8
- package/dist/src/cli/install/installers.js +18 -3
- package/dist/src/cli/install/installers.js.map +1 -1
- package/dist/src/cli/install/notes.d.ts +2 -0
- package/dist/src/cli/install/notes.js +8 -0
- package/dist/src/cli/install/notes.js.map +1 -0
- package/dist/src/cli/install/types.d.ts +1 -0
- package/dist/src/cli/install/types.js +12 -0
- package/dist/src/cli/install/types.js.map +1 -1
- package/dist/src/cli/plugin/build.d.ts +23 -0
- package/dist/src/cli/plugin/build.js +165 -0
- package/dist/src/cli/plugin/build.js.map +1 -0
- package/dist/src/cli/plugin/command.d.ts +4 -0
- package/dist/src/cli/plugin/command.js +89 -0
- package/dist/src/cli/plugin/command.js.map +1 -0
- package/dist/src/cli/plugin/index.d.ts +5 -0
- package/dist/src/cli/plugin/index.js +15 -0
- package/dist/src/cli/plugin/index.js.map +1 -0
- package/dist/src/cli/plugin/listing.d.ts +21 -0
- package/dist/src/cli/plugin/listing.js +44 -0
- package/dist/src/cli/plugin/listing.js.map +1 -0
- package/dist/src/cli/plugin/validate.d.ts +21 -0
- package/dist/src/cli/plugin/validate.js +496 -0
- package/dist/src/cli/plugin/validate.js.map +1 -0
- package/dist/src/cli/plugin/zip.d.ts +6 -0
- package/dist/src/cli/plugin/zip.js +83 -0
- package/dist/src/cli/plugin/zip.js.map +1 -0
- package/dist/src/cli/setup/flows/configure-existing.js +5 -0
- package/dist/src/cli/setup/flows/configure-existing.js.map +1 -1
- package/dist/src/cli/setup/flows/local-setup.js +3 -0
- package/dist/src/cli/setup/flows/local-setup.js.map +1 -1
- package/dist/src/cli-utils.d.ts +2 -0
- package/dist/src/cli-utils.js +6 -0
- package/dist/src/cli-utils.js.map +1 -1
- package/dist/src/config/instances-schema.d.ts +2 -0
- package/dist/src/config/instances-schema.js +5 -0
- package/dist/src/config/instances-schema.js.map +1 -1
- package/dist/src/config.d.ts +1 -1
- package/dist/src/config.js +6 -10
- package/dist/src/config.js.map +1 -1
- package/dist/src/configuration/default-project.d.ts +8 -0
- package/dist/src/configuration/default-project.js +83 -0
- package/dist/src/configuration/default-project.js.map +1 -0
- package/dist/src/configuration/operator-ownership.d.ts +7 -0
- package/dist/src/configuration/operator-ownership.js +216 -0
- package/dist/src/configuration/operator-ownership.js.map +1 -0
- package/dist/src/configuration/operator-projects.d.ts +16 -0
- package/dist/src/configuration/operator-projects.js +117 -0
- package/dist/src/configuration/operator-projects.js.map +1 -0
- package/dist/src/configuration/policy.d.ts +1 -0
- package/dist/src/configuration/policy.js +3 -0
- package/dist/src/configuration/policy.js.map +1 -1
- package/dist/src/configuration/scope-ids.js +5 -4
- package/dist/src/configuration/scope-ids.js.map +1 -1
- package/dist/src/configuration/scoped-execution.js +32 -10
- package/dist/src/configuration/scoped-execution.js.map +1 -1
- package/dist/src/configuration/service.d.ts +0 -1
- package/dist/src/configuration/service.js +0 -17
- package/dist/src/configuration/service.js.map +1 -1
- package/dist/src/contracts/storage.d.ts +2 -2
- package/dist/src/entities/access_tokens/registry.js +7 -6
- package/dist/src/entities/access_tokens/registry.js.map +1 -1
- package/dist/src/entities/audit_events/registry.js +5 -4
- package/dist/src/entities/audit_events/registry.js.map +1 -1
- package/dist/src/entities/context/accounts.d.ts +19 -0
- package/dist/src/entities/context/accounts.js +115 -0
- package/dist/src/entities/context/accounts.js.map +1 -0
- package/dist/src/entities/context/context-manager.d.ts +0 -1
- package/dist/src/entities/context/context-manager.js +0 -82
- package/dist/src/entities/context/context-manager.js.map +1 -1
- package/dist/src/entities/context/handlers.d.ts +3 -1
- package/dist/src/entities/context/handlers.js +9 -0
- package/dist/src/entities/context/handlers.js.map +1 -1
- package/dist/src/entities/context/output-schema.d.ts +49 -1
- package/dist/src/entities/context/output-schema.js +28 -0
- package/dist/src/entities/context/output-schema.js.map +1 -1
- package/dist/src/entities/context/registry.js +1 -1
- package/dist/src/entities/context/registry.js.map +1 -1
- package/dist/src/entities/context/schema.d.ts +26 -0
- package/dist/src/entities/context/schema.js +30 -0
- package/dist/src/entities/context/schema.js.map +1 -1
- package/dist/src/entities/context/scope-search.js +5 -0
- package/dist/src/entities/context/scope-search.js.map +1 -1
- package/dist/src/entities/core/registry.js +8 -7
- package/dist/src/entities/core/registry.js.map +1 -1
- package/dist/src/entities/core/schema-readonly.d.ts +4 -4
- package/dist/src/entities/core/schema-readonly.js +1 -1
- package/dist/src/entities/core/schema-readonly.js.map +1 -1
- package/dist/src/entities/deploy-keys/registry.js +4 -3
- package/dist/src/entities/deploy-keys/registry.js.map +1 -1
- package/dist/src/entities/environments/registry.js +3 -2
- package/dist/src/entities/environments/registry.js.map +1 -1
- package/dist/src/entities/environments/schema-readonly.d.ts +1 -1
- package/dist/src/entities/files/registry.js +2 -1
- package/dist/src/entities/files/registry.js.map +1 -1
- package/dist/src/entities/integrations/registry.js +8 -7
- package/dist/src/entities/integrations/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/iterations/schema-readonly.js +1 -1
- package/dist/src/entities/iterations/schema-readonly.js.map +1 -1
- package/dist/src/entities/job-token-scope/registry.js +2 -1
- package/dist/src/entities/job-token-scope/registry.js.map +1 -1
- package/dist/src/entities/members/registry.js +13 -12
- package/dist/src/entities/members/registry.js.map +1 -1
- package/dist/src/entities/members/schema-readonly.js +2 -2
- package/dist/src/entities/members/schema-readonly.js.map +1 -1
- package/dist/src/entities/members/schema.d.ts +2 -2
- package/dist/src/entities/members/schema.js +10 -6
- package/dist/src/entities/members/schema.js.map +1 -1
- package/dist/src/entities/milestones/registry.js +8 -7
- package/dist/src/entities/milestones/registry.js.map +1 -1
- package/dist/src/entities/milestones/schema-readonly.js +1 -1
- package/dist/src/entities/milestones/schema-readonly.js.map +1 -1
- package/dist/src/entities/milestones/schema.js +1 -1
- package/dist/src/entities/milestones/schema.js.map +1 -1
- package/dist/src/entities/mrs/registry.js +26 -25
- package/dist/src/entities/mrs/registry.js.map +1 -1
- package/dist/src/entities/mrs/schema-readonly.js +3 -3
- package/dist/src/entities/mrs/schema-readonly.js.map +1 -1
- package/dist/src/entities/mrs/schema.d.ts +1 -1
- package/dist/src/entities/mrs/schema.js +9 -6
- package/dist/src/entities/mrs/schema.js.map +1 -1
- package/dist/src/entities/pipelines/registry.js +31 -39
- package/dist/src/entities/pipelines/registry.js.map +1 -1
- package/dist/src/entities/pipelines/schema-readonly.d.ts +8 -8
- package/dist/src/entities/pipelines/schema-readonly.js +10 -7
- package/dist/src/entities/pipelines/schema-readonly.js.map +1 -1
- package/dist/src/entities/pipelines/schema.js +2 -2
- package/dist/src/entities/pipelines/schema.js.map +1 -1
- package/dist/src/entities/pipelines/trace.d.ts +20 -0
- package/dist/src/entities/pipelines/trace.js +156 -0
- package/dist/src/entities/pipelines/trace.js.map +1 -0
- package/dist/src/entities/refs/registry.js +3 -2
- package/dist/src/entities/refs/registry.js.map +1 -1
- package/dist/src/entities/releases/registry.js +5 -3
- package/dist/src/entities/releases/registry.js.map +1 -1
- package/dist/src/entities/releases/schema.js +1 -1
- package/dist/src/entities/releases/schema.js.map +1 -1
- package/dist/src/entities/runners/project-access.js +7 -2
- package/dist/src/entities/runners/project-access.js.map +1 -1
- package/dist/src/entities/runners/registry.js +2 -1
- package/dist/src/entities/runners/registry.js.map +1 -1
- package/dist/src/entities/snippets/registry.js +10 -8
- package/dist/src/entities/snippets/registry.js.map +1 -1
- package/dist/src/entities/snippets/schema-readonly.js +1 -1
- package/dist/src/entities/snippets/schema-readonly.js.map +1 -1
- package/dist/src/entities/snippets/schema.js +2 -2
- package/dist/src/entities/snippets/schema.js.map +1 -1
- package/dist/src/entities/utils.d.ts +1 -0
- package/dist/src/entities/utils.js +2 -1
- package/dist/src/entities/utils.js.map +1 -1
- package/dist/src/entities/webhooks/registry.js +10 -8
- package/dist/src/entities/webhooks/registry.js.map +1 -1
- package/dist/src/entities/webhooks/schema-readonly.js +1 -1
- package/dist/src/entities/webhooks/schema-readonly.js.map +1 -1
- package/dist/src/entities/webhooks/schema.js +3 -3
- package/dist/src/entities/webhooks/schema.js.map +1 -1
- package/dist/src/handlers.js +175 -65
- package/dist/src/handlers.js.map +1 -1
- package/dist/src/main.js +23 -5
- package/dist/src/main.js.map +1 -1
- package/dist/src/mcp-server-context.d.ts +3 -0
- package/dist/src/mcp-server-context.js +13 -0
- package/dist/src/mcp-server-context.js.map +1 -0
- package/dist/src/middleware/oauth-auth.js +5 -2
- package/dist/src/middleware/oauth-auth.js.map +1 -1
- package/dist/src/oauth/code-exchange.d.ts +7 -0
- package/dist/src/oauth/code-exchange.js +38 -0
- package/dist/src/oauth/code-exchange.js.map +1 -0
- package/dist/src/oauth/endpoints/callback.js +15 -17
- package/dist/src/oauth/endpoints/callback.js.map +1 -1
- package/dist/src/oauth/endpoints/revoke.js +2 -21
- package/dist/src/oauth/endpoints/revoke.js.map +1 -1
- package/dist/src/oauth/gitlab-token-refresh.d.ts +1 -0
- package/dist/src/oauth/gitlab-token-refresh.js +17 -0
- package/dist/src/oauth/gitlab-token-refresh.js.map +1 -1
- package/dist/src/oauth/grant-revocation.d.ts +10 -0
- package/dist/src/oauth/grant-revocation.js +179 -0
- package/dist/src/oauth/grant-revocation.js.map +1 -0
- package/dist/src/oauth/session-store.d.ts +8 -1
- package/dist/src/oauth/session-store.js +36 -3
- package/dist/src/oauth/session-store.js.map +1 -1
- package/dist/src/oauth/storage/file.d.ts +7 -2
- package/dist/src/oauth/storage/file.js +30 -10
- package/dist/src/oauth/storage/file.js.map +1 -1
- package/dist/src/oauth/storage/memory.d.ts +13 -2
- package/dist/src/oauth/storage/memory.js +211 -14
- package/dist/src/oauth/storage/memory.js.map +1 -1
- package/dist/src/oauth/storage/types.d.ts +21 -1
- package/dist/src/oauth/storage/types.js +6 -1
- package/dist/src/oauth/storage/types.js.map +1 -1
- package/dist/src/oauth/types.d.ts +11 -0
- package/dist/src/profiles/scope-enforcer.d.ts +2 -0
- package/dist/src/profiles/scope-enforcer.js +37 -15
- package/dist/src/profiles/scope-enforcer.js.map +1 -1
- package/dist/src/registry-manager.js +7 -0
- package/dist/src/registry-manager.js.map +1 -1
- package/dist/src/server.js +21 -16
- package/dist/src/server.js.map +1 -1
- package/dist/src/services/AdminDetector.d.ts +1 -1
- package/dist/src/services/AdminDetector.js +4 -4
- package/dist/src/services/AdminDetector.js.map +1 -1
- package/dist/src/services/ConnectionManager.d.ts +0 -1
- package/dist/src/services/ConnectionManager.js +18 -52
- package/dist/src/services/ConnectionManager.js.map +1 -1
- package/dist/src/services/HealthMonitor.js +4 -2
- package/dist/src/services/HealthMonitor.js.map +1 -1
- package/dist/src/services/NamespaceTierDetector.js +26 -27
- package/dist/src/services/NamespaceTierDetector.js.map +1 -1
- package/dist/src/services/TokenScopeDetector.d.ts +1 -1
- package/dist/src/services/TokenScopeDetector.js +3 -3
- package/dist/src/services/TokenScopeDetector.js.map +1 -1
- package/dist/src/session-manager.d.ts +1 -1
- package/dist/src/session-manager.js +13 -5
- package/dist/src/session-manager.js.map +1 -1
- package/dist/src/utils/api-path.d.ts +5 -0
- package/dist/src/utils/api-path.js +54 -0
- package/dist/src/utils/api-path.js.map +1 -0
- package/dist/src/utils/fetch.d.ts +1 -1
- package/dist/src/utils/fetch.js +12 -5
- package/dist/src/utils/fetch.js.map +1 -1
- package/dist/src/utils/gitlab-api.d.ts +6 -0
- package/dist/src/utils/gitlab-api.js +22 -4
- package/dist/src/utils/gitlab-api.js.map +1 -1
- package/dist/src/utils/gitlab-base-url.js +4 -0
- package/dist/src/utils/gitlab-base-url.js.map +1 -1
- package/dist/src/utils/namespace.js +2 -1
- package/dist/src/utils/namespace.js.map +1 -1
- package/dist/src/utils/projectIdentifier.js +10 -12
- package/dist/src/utils/projectIdentifier.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +28 -22
- package/plugin/assets/composer-icon-dark.png +0 -0
- package/plugin/assets/composer-icon-dark.svg +17 -0
- package/plugin/assets/composer-icon.png +0 -0
- package/plugin/assets/composer-icon.svg +17 -0
- package/plugin/assets/logo.png +0 -0
- package/plugin/assets/screenshot-1.png +0 -0
- package/plugin/assets/screenshot-2.png +0 -0
- package/plugin/schemas/mcp.schema.json +120 -0
- package/plugin/schemas/plugin.schema.json +65 -0
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.requiredId = exports.flexibleBooleanNullable = exports.flexibleBoolean = exports.GITLAB_MAX_PER_PAGE = exports.GITLAB_DEFAULT_PER_PAGE = void 0;
|
|
3
|
+
exports.numericId = exports.requiredId = exports.flexibleBooleanNullable = exports.flexibleBoolean = exports.GITLAB_MAX_PER_PAGE = exports.GITLAB_DEFAULT_PER_PAGE = void 0;
|
|
4
4
|
exports.paginationFields = paginationFields;
|
|
5
5
|
exports.assertDefined = assertDefined;
|
|
6
6
|
exports.validateScopeId = validateScopeId;
|
|
@@ -42,6 +42,7 @@ exports.flexibleBooleanNullable = DEFAULT_NULL
|
|
|
42
42
|
? exports.flexibleBoolean.nullable().default(null)
|
|
43
43
|
: exports.flexibleBoolean.nullable();
|
|
44
44
|
exports.requiredId = zod_1.z.preprocess((val) => val ?? '', zod_1.z.coerce.string().min(1));
|
|
45
|
+
exports.numericId = zod_1.z.preprocess((value) => (typeof value === 'number' && !Number.isSafeInteger(value) ? '' : (value ?? '')), zod_1.z.coerce.string().regex(/^[1-9]\d*$/, 'Expected a positive integer ID'));
|
|
45
46
|
function assertDefined(value, fieldName) {
|
|
46
47
|
if (value === undefined) {
|
|
47
48
|
throw new Error(`${fieldName} is required but was not provided`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/entities/utils.ts"],"names":[],"mappings":";;;AAsCA,4CAoBC;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/entities/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -41,6 +41,8 @@ const z = __importStar(require("zod"));
|
|
|
41
41
|
const schema_readonly_1 = require("./schema-readonly");
|
|
42
42
|
const schema_1 = require("./schema");
|
|
43
43
|
const gitlab_api_1 = require("../../utils/gitlab-api");
|
|
44
|
+
const projectIdentifier_1 = require("../../utils/projectIdentifier");
|
|
45
|
+
const api_path_1 = require("../../utils/api-path");
|
|
44
46
|
const utils_1 = require("../utils");
|
|
45
47
|
const instance_version_1 = require("../instance-version");
|
|
46
48
|
function assertGroupHooksAvailable(scope) {
|
|
@@ -63,10 +65,10 @@ exports.webhooksToolRegistry = new Map([
|
|
|
63
65
|
assertGroupHooksAvailable(input.scope);
|
|
64
66
|
const getBasePath = (scope, projectId, groupId) => {
|
|
65
67
|
if (scope === 'project' && projectId) {
|
|
66
|
-
return `projects/${
|
|
68
|
+
return `projects/${(0, projectIdentifier_1.normalizeProjectId)(projectId)}/hooks`;
|
|
67
69
|
}
|
|
68
70
|
else if (scope === 'group' && groupId) {
|
|
69
|
-
return `groups/${
|
|
71
|
+
return `groups/${(0, projectIdentifier_1.normalizeProjectId)(groupId)}/hooks`;
|
|
70
72
|
}
|
|
71
73
|
throw new Error('Invalid scope or missing project/group ID');
|
|
72
74
|
};
|
|
@@ -80,7 +82,7 @@ exports.webhooksToolRegistry = new Map([
|
|
|
80
82
|
}
|
|
81
83
|
case 'get': {
|
|
82
84
|
const basePath = getBasePath(input.scope, input.projectId, input.groupId);
|
|
83
|
-
return gitlab_api_1.gitlab.get(`${basePath}/${input.hookId}`);
|
|
85
|
+
return gitlab_api_1.gitlab.get(`${basePath}/${(0, api_path_1.encodeApiSegment)(input.hookId)}`);
|
|
84
86
|
}
|
|
85
87
|
default:
|
|
86
88
|
throw new Error(`Unknown action: ${input.action}`);
|
|
@@ -123,10 +125,10 @@ exports.webhooksToolRegistry = new Map([
|
|
|
123
125
|
}
|
|
124
126
|
const getBasePath = (scope, projectId, groupId) => {
|
|
125
127
|
if (scope === 'project' && projectId) {
|
|
126
|
-
return `projects/${
|
|
128
|
+
return `projects/${(0, projectIdentifier_1.normalizeProjectId)(projectId)}/hooks`;
|
|
127
129
|
}
|
|
128
130
|
else if (scope === 'group' && groupId) {
|
|
129
|
-
return `groups/${
|
|
131
|
+
return `groups/${(0, projectIdentifier_1.normalizeProjectId)(groupId)}/hooks`;
|
|
130
132
|
}
|
|
131
133
|
throw new Error('Invalid scope or missing project/group ID');
|
|
132
134
|
};
|
|
@@ -150,21 +152,21 @@ exports.webhooksToolRegistry = new Map([
|
|
|
150
152
|
}
|
|
151
153
|
case 'update': {
|
|
152
154
|
const basePath = getBasePath(input.scope, input.projectId, input.groupId);
|
|
153
|
-
return gitlab_api_1.gitlab.put(`${basePath}/${input.hookId}`, {
|
|
155
|
+
return gitlab_api_1.gitlab.put(`${basePath}/${(0, api_path_1.encodeApiSegment)(input.hookId)}`, {
|
|
154
156
|
body: buildRequestBody(input),
|
|
155
157
|
contentType: 'json',
|
|
156
158
|
});
|
|
157
159
|
}
|
|
158
160
|
case 'delete': {
|
|
159
161
|
const basePath = getBasePath(input.scope, input.projectId, input.groupId);
|
|
160
|
-
await gitlab_api_1.gitlab.delete(`${basePath}/${input.hookId}`);
|
|
162
|
+
await gitlab_api_1.gitlab.delete(`${basePath}/${(0, api_path_1.encodeApiSegment)(input.hookId)}`);
|
|
161
163
|
return { success: true, message: 'Webhook deleted successfully' };
|
|
162
164
|
}
|
|
163
165
|
case 'test': {
|
|
164
166
|
const basePath = getBasePath(input.scope, input.projectId, input.groupId);
|
|
165
167
|
if (input.scope === 'group')
|
|
166
168
|
(0, instance_version_1.assertInstanceAtLeast)('17.1', 'Testing a group webhook');
|
|
167
|
-
return gitlab_api_1.gitlab.post(`${basePath}/${input.hookId}/test/${input.trigger}`, {
|
|
169
|
+
return gitlab_api_1.gitlab.post(`${basePath}/${(0, api_path_1.encodeApiSegment)(input.hookId)}/test/${(0, api_path_1.encodeApiSegment)(input.trigger)}`, {
|
|
168
170
|
contentType: 'json',
|
|
169
171
|
});
|
|
170
172
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"registry.js","sourceRoot":"","sources":["../../../../src/entities/webhooks/registry.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"registry.js","sourceRoot":"","sources":["../../../../src/entities/webhooks/registry.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,7 +16,7 @@ const GetWebhookSchema = zod_1.z.object({
|
|
|
16
16
|
scope: scopeField,
|
|
17
17
|
projectId: zod_1.z.string().optional().describe('Project ID or path (required if scope=project)'),
|
|
18
18
|
groupId: zod_1.z.string().optional().describe('Group ID or path (required if scope=group)'),
|
|
19
|
-
hookId: utils_1.
|
|
19
|
+
hookId: utils_1.numericId.describe('Webhook ID (required)'),
|
|
20
20
|
});
|
|
21
21
|
exports.BrowseWebhooksSchema = zod_1.z.discriminatedUnion('action', [
|
|
22
22
|
ListWebhooksSchema,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema-readonly.js","sourceRoot":"","sources":["../../../../src/entities/webhooks/schema-readonly.ts"],"names":[],"mappings":";;;AAAA,6BAAwB;AACxB,
|
|
1
|
+
{"version":3,"file":"schema-readonly.js","sourceRoot":"","sources":["../../../../src/entities/webhooks/schema-readonly.ts"],"names":[],"mappings":";;;AAAA,6BAAwB;AACxB,oCAAuD;AAYvD,MAAM,UAAU,GAAG,OAAC,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,qCAAqC,CAAC,CAAC;AAGhG,MAAM,kBAAkB,GAAG,OAAC,CAAC,MAAM,CAAC;IAClC,MAAM,EAAE,OAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,0CAA0C,CAAC;IAC9E,KAAK,EAAE,UAAU;IACjB,SAAS,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,gDAAgD,CAAC;IAC3F,OAAO,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,4CAA4C,CAAC;IACrF,GAAG,IAAA,wBAAgB,GAAE;CACtB,CAAC,CAAC;AAGH,MAAM,gBAAgB,GAAG,OAAC,CAAC,MAAM,CAAC;IAChC,MAAM,EAAE,OAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,2BAA2B,CAAC;IAC9D,KAAK,EAAE,UAAU;IACjB,SAAS,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,gDAAgD,CAAC;IAC3F,OAAO,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,4CAA4C,CAAC;IACrF,MAAM,EAAE,iBAAS,CAAC,QAAQ,CAAC,uBAAuB,CAAC;CACpD,CAAC,CAAC;AAGU,QAAA,oBAAoB,GAAG,OAAC,CAAC,kBAAkB,CAAC,QAAQ,EAAE;IACjE,kBAAkB;IAClB,gBAAgB;CACjB,CAAC,CAAC"}
|
|
@@ -70,7 +70,7 @@ const UpdateWebhookSchema = zod_1.z.object({
|
|
|
70
70
|
scope: scopeField,
|
|
71
71
|
projectId: zod_1.z.string().optional().describe('Project ID or path (required if scope=project)'),
|
|
72
72
|
groupId: zod_1.z.string().optional().describe('Group ID or path (required if scope=group)'),
|
|
73
|
-
hookId: utils_1.
|
|
73
|
+
hookId: utils_1.numericId.describe('Webhook ID (required)'),
|
|
74
74
|
url: zod_1.z.string().optional().describe('Webhook URL'),
|
|
75
75
|
name: zod_1.z.string().optional().describe('Human-readable webhook name (GitLab 17.1+)'),
|
|
76
76
|
description: zod_1.z.string().optional().describe('Webhook description (GitLab 17.1+)'),
|
|
@@ -82,14 +82,14 @@ const DeleteWebhookSchema = zod_1.z.object({
|
|
|
82
82
|
scope: scopeField,
|
|
83
83
|
projectId: zod_1.z.string().optional().describe('Project ID or path (required if scope=project)'),
|
|
84
84
|
groupId: zod_1.z.string().optional().describe('Group ID or path (required if scope=group)'),
|
|
85
|
-
hookId: utils_1.
|
|
85
|
+
hookId: utils_1.numericId.describe('Webhook ID (required)'),
|
|
86
86
|
});
|
|
87
87
|
const TestWebhookSchema = zod_1.z.object({
|
|
88
88
|
action: zod_1.z.literal('test'),
|
|
89
89
|
scope: scopeField,
|
|
90
90
|
projectId: zod_1.z.string().optional().describe('Project ID or path (required if scope=project)'),
|
|
91
91
|
groupId: zod_1.z.string().optional().describe('Group ID or path (required if scope=group)'),
|
|
92
|
-
hookId: utils_1.
|
|
92
|
+
hookId: utils_1.numericId.describe('Webhook ID (required)'),
|
|
93
93
|
trigger: TriggerEventSchema.describe('Event type to test (required)'),
|
|
94
94
|
});
|
|
95
95
|
exports.ManageWebhookSchema = zod_1.z.discriminatedUnion('action', [
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../../src/entities/webhooks/schema.ts"],"names":[],"mappings":";;;AAAA,6BAAwB;AACxB,
|
|
1
|
+
{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../../src/entities/webhooks/schema.ts"],"names":[],"mappings":"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"}
|
package/dist/src/handlers.js
CHANGED
|
@@ -49,10 +49,17 @@ const config_1 = require("./config");
|
|
|
49
49
|
const schema_utils_1 = require("./utils/schema-utils");
|
|
50
50
|
const tool_result_1 = require("./utils/tool-result");
|
|
51
51
|
const tool_auth_1 = require("./oauth/tool-auth");
|
|
52
|
+
const chat_accounts_1 = require("./accounts/chat-accounts");
|
|
53
|
+
const mcp_server_context_1 = require("./mcp-server-context");
|
|
54
|
+
const token_account_1 = require("./accounts/token-account");
|
|
52
55
|
const configuration_1 = require("./configuration");
|
|
53
56
|
const policy_1 = require("./configuration/policy");
|
|
54
57
|
const scoped_execution_1 = require("./configuration/scoped-execution");
|
|
55
58
|
const scope_ids_1 = require("./configuration/scope-ids");
|
|
59
|
+
const operator_projects_1 = require("./configuration/operator-projects");
|
|
60
|
+
const operator_ownership_1 = require("./configuration/operator-ownership");
|
|
61
|
+
const scope_enforcer_1 = require("./profiles/scope-enforcer");
|
|
62
|
+
const default_project_1 = require("./configuration/default-project");
|
|
56
63
|
function hasAction(value) {
|
|
57
64
|
return (typeof value === 'object' &&
|
|
58
65
|
value !== null &&
|
|
@@ -152,6 +159,19 @@ async function tryManageContextFastPath(toolName, toolArguments, effectiveInstan
|
|
|
152
159
|
healthMonitor.isInstanceReachable(effectiveInstanceUrl)) {
|
|
153
160
|
return null;
|
|
154
161
|
}
|
|
162
|
+
const result = await executeWithoutBootstrap(toolName, toolArguments, effectiveInstanceUrl, requestScopes);
|
|
163
|
+
if (result)
|
|
164
|
+
healthMonitor.forceReconnect(effectiveInstanceUrl);
|
|
165
|
+
return result;
|
|
166
|
+
}
|
|
167
|
+
async function tryWithoutBootstrap(request, toolArguments, effectiveInstanceUrl, healthMonitor, sessionId, requestScopes) {
|
|
168
|
+
const toolName = request.params.name;
|
|
169
|
+
const fastPath = await tryManageContextFastPath(toolName, toolArguments, effectiveInstanceUrl, healthMonitor, sessionId, requestScopes);
|
|
170
|
+
if (fastPath || !managesAccounts(request))
|
|
171
|
+
return fastPath;
|
|
172
|
+
return executeWithoutBootstrap(toolName, toolArguments, effectiveInstanceUrl, requestScopes);
|
|
173
|
+
}
|
|
174
|
+
async function executeWithoutBootstrap(toolName, toolArguments, effectiveInstanceUrl, requestScopes) {
|
|
155
175
|
if (config_1.LOG_FORMAT === 'condensed') {
|
|
156
176
|
const action = toolArguments && typeof toolArguments.action === 'string' ? toolArguments.action : undefined;
|
|
157
177
|
const requestTracker = (0, index_1.getRequestTracker)();
|
|
@@ -159,21 +179,21 @@ async function tryManageContextFastPath(toolName, toolArguments, effectiveInstan
|
|
|
159
179
|
}
|
|
160
180
|
const { RegistryManager } = await Promise.resolve().then(() => __importStar(require('./registry-manager')));
|
|
161
181
|
const registryManager = RegistryManager.getInstance();
|
|
162
|
-
if (registryManager.hasToolHandler(toolName, effectiveInstanceUrl)) {
|
|
163
|
-
|
|
164
|
-
if (result === undefined) {
|
|
165
|
-
return null;
|
|
166
|
-
}
|
|
167
|
-
healthMonitor.forceReconnect(effectiveInstanceUrl);
|
|
168
|
-
return (0, tool_result_1.formatToolResult)(result, registryManager.getTool(toolName, effectiveInstanceUrl, requestScopes));
|
|
182
|
+
if (!registryManager.hasToolHandler(toolName, effectiveInstanceUrl)) {
|
|
183
|
+
return null;
|
|
169
184
|
}
|
|
170
|
-
|
|
185
|
+
const result = await registryManager.executeTool(toolName, toolArguments, effectiveInstanceUrl, requestScopes);
|
|
186
|
+
if (result === undefined) {
|
|
187
|
+
return null;
|
|
188
|
+
}
|
|
189
|
+
return (0, tool_result_1.formatToolResult)(result, registryManager.getTool(toolName, effectiveInstanceUrl, requestScopes));
|
|
171
190
|
}
|
|
172
191
|
async function ensureBootstrapped(ctx) {
|
|
173
192
|
const { effectiveInstanceUrl, oauthMode, requestScopes, connectionManager, bootstrapState } = ctx;
|
|
174
193
|
bootstrapState.started = true;
|
|
175
194
|
try {
|
|
176
|
-
|
|
195
|
+
const firstInitialization = !connectionManager.isConnected(effectiveInstanceUrl);
|
|
196
|
+
if (firstInitialization) {
|
|
177
197
|
if (config_1.LOG_FORMAT === 'verbose') {
|
|
178
198
|
(0, logger_1.logInfo)('Connection not initialized, attempting to initialize...');
|
|
179
199
|
}
|
|
@@ -194,6 +214,8 @@ async function ensureBootstrapped(ctx) {
|
|
|
194
214
|
err: cacheError,
|
|
195
215
|
});
|
|
196
216
|
}
|
|
217
|
+
if (firstInitialization)
|
|
218
|
+
announceToolListChange(effectiveInstanceUrl);
|
|
197
219
|
if (config_1.LOG_FORMAT === 'verbose') {
|
|
198
220
|
try {
|
|
199
221
|
const instanceInfo = connectionManager.getInstanceInfo(effectiveInstanceUrl);
|
|
@@ -211,6 +233,13 @@ async function ensureBootstrapped(ctx) {
|
|
|
211
233
|
return formatBootstrapFailure(ctx, initError);
|
|
212
234
|
}
|
|
213
235
|
}
|
|
236
|
+
function announceToolListChange(instanceUrl) {
|
|
237
|
+
void Promise.resolve().then(() => __importStar(require('./session-manager'))).then(({ getSessionManager }) => getSessionManager().broadcastToolsListChanged(instanceUrl))
|
|
238
|
+
.catch((error) => (0, logger_1.logDebug)('Could not announce the tool list', { err: error }));
|
|
239
|
+
void (0, mcp_server_context_1.currentMcpServer)()
|
|
240
|
+
?.sendToolListChanged()
|
|
241
|
+
.catch((error) => (0, logger_1.logDebug)('Could not announce the tool list', { err: error }));
|
|
242
|
+
}
|
|
214
243
|
function bootstrapFailureState(monitorState, category) {
|
|
215
244
|
if (monitorState === 'connecting' || monitorState === 'failed')
|
|
216
245
|
return monitorState;
|
|
@@ -237,12 +266,65 @@ function formatBootstrapFailure(ctx, initError) {
|
|
|
237
266
|
}
|
|
238
267
|
return (0, tool_auth_1.withReauthChallenge)((0, tool_result_1.errorToolResult)(connError), initError);
|
|
239
268
|
}
|
|
269
|
+
const ACCOUNT_ACTIONS = new Set([
|
|
270
|
+
'list_accounts',
|
|
271
|
+
'switch_account',
|
|
272
|
+
'link_account',
|
|
273
|
+
'unlink_account',
|
|
274
|
+
]);
|
|
275
|
+
function managesAccounts(request) {
|
|
276
|
+
const action = request.params.arguments?.action;
|
|
277
|
+
return (request.params.name === 'manage_context' &&
|
|
278
|
+
typeof action === 'string' &&
|
|
279
|
+
ACCOUNT_ACTIONS.has(action));
|
|
280
|
+
}
|
|
240
281
|
function activeInstanceUrl(oauthEnabled, oauthContextUrl) {
|
|
241
282
|
const raw = oauthEnabled
|
|
242
283
|
? (oauthContextUrl ?? config_1.GITLAB_BASE_URL)
|
|
243
|
-
: (
|
|
284
|
+
: ((0, token_account_1.currentTokenAccount)()?.instanceUrl ?? config_1.GITLAB_BASE_URL);
|
|
244
285
|
return (0, url_1.normalizeInstanceUrl)(raw);
|
|
245
286
|
}
|
|
287
|
+
async function pinSessionInstance(sessionId, oauthEnabled, oauthContextUrl, instanceUrl) {
|
|
288
|
+
if (oauthEnabled && oauthContextUrl === undefined)
|
|
289
|
+
return;
|
|
290
|
+
const { getSessionManager } = await Promise.resolve().then(() => __importStar(require('./session-manager')));
|
|
291
|
+
getSessionManager().setSessionInstanceUrl(sessionId, instanceUrl);
|
|
292
|
+
}
|
|
293
|
+
const HANDLER_TIMEOUT = Symbol('handler_timeout');
|
|
294
|
+
function startCallDeadline() {
|
|
295
|
+
let expired = false;
|
|
296
|
+
let timer;
|
|
297
|
+
const promise = new Promise((resolve) => {
|
|
298
|
+
timer = setTimeout(() => {
|
|
299
|
+
expired = true;
|
|
300
|
+
resolve(HANDLER_TIMEOUT);
|
|
301
|
+
}, config_1.HANDLER_TIMEOUT_MS);
|
|
302
|
+
});
|
|
303
|
+
return { expired: promise, isExpired: () => expired, clear: () => clearTimeout(timer) };
|
|
304
|
+
}
|
|
305
|
+
function handlerTimeoutResult(request, declaredIdempotent, bootstrapState, requestInstanceUrl) {
|
|
306
|
+
const toolName = request.params.name;
|
|
307
|
+
const requested = request.params.arguments?.action;
|
|
308
|
+
const action = typeof requested === 'string' ? requested : 'unknown';
|
|
309
|
+
const retryable = isIdempotentOperation(toolName, declaredIdempotent);
|
|
310
|
+
const timeoutError = (0, error_handler_1.createTimeoutError)(toolName, action, config_1.HANDLER_TIMEOUT_MS, retryable);
|
|
311
|
+
(0, logger_1.logError)(`Handler timeout: tool '${toolName}' timed out after ${config_1.HANDLER_TIMEOUT_MS}ms`);
|
|
312
|
+
if (bootstrapState.started && !bootstrapState.complete) {
|
|
313
|
+
HealthMonitor_1.HealthMonitor.getInstance().reportError(requestInstanceUrl, new Error(`Handler timed out after ${config_1.HANDLER_TIMEOUT_MS}ms — bootstrap did not complete`));
|
|
314
|
+
ConnectionManager_1.ConnectionManager.getInstance().clearInflight(requestInstanceUrl);
|
|
315
|
+
}
|
|
316
|
+
recordEarlyReturnError(toolName, action, timeoutError.message);
|
|
317
|
+
return (0, tool_result_1.errorToolResult)(timeoutError);
|
|
318
|
+
}
|
|
319
|
+
function recordToolError(errMsg) {
|
|
320
|
+
const reqTracker = (0, index_1.getRequestTracker)();
|
|
321
|
+
reqTracker.setErrorForCurrentRequest(errMsg);
|
|
322
|
+
const curRequestId = (0, index_1.getCurrentRequestId)();
|
|
323
|
+
const sessionId = curRequestId ? reqTracker.getStack(curRequestId)?.sessionId : undefined;
|
|
324
|
+
if (sessionId) {
|
|
325
|
+
(0, index_1.getConnectionTracker)().recordError(sessionId, errMsg);
|
|
326
|
+
}
|
|
327
|
+
}
|
|
246
328
|
async function withoutRestrictedTools(tools, caller, registryManager) {
|
|
247
329
|
let policy;
|
|
248
330
|
try {
|
|
@@ -260,19 +342,37 @@ async function withoutRestrictedTools(tools, caller, registryManager) {
|
|
|
260
342
|
}
|
|
261
343
|
return listed;
|
|
262
344
|
}
|
|
263
|
-
async function prepareScopedCall(toolName, args, configured, registryManager) {
|
|
345
|
+
async function prepareScopedCall(toolName, args, configured, registryManager, expired) {
|
|
264
346
|
const unscoped = settingsRejection(toolName, args, (0, policy_1.withoutScope)(configured), registryManager);
|
|
265
|
-
if (unscoped ||
|
|
347
|
+
if (unscoped || (0, policy_1.isExemptFromSettings)(toolName))
|
|
266
348
|
return { rejection: unscoped, args, policy: configured };
|
|
267
|
-
const policy = await (0, scope_ids_1.withScopePaths)(configured);
|
|
268
|
-
const selected = (0, scoped_execution_1.parseScopedArguments)(toolName, args);
|
|
269
349
|
const action = typeof args.action === 'string' ? args.action : undefined;
|
|
350
|
+
const defaultProject = (0, config_1.getEffectiveProjectId)(undefined);
|
|
351
|
+
const defaults = defaultProject
|
|
352
|
+
? await (0, default_project_1.withDefaultProject)(toolName, args, registryManager.getDeclaredArguments(toolName, action), defaultProject, expired)
|
|
353
|
+
: { args, read: undefined };
|
|
354
|
+
args = defaults.args;
|
|
355
|
+
if (!configured.scopeEnforcer && config_1.GITLAB_ALLOWED_PROJECT_IDS.length === 0)
|
|
356
|
+
return { rejection: null, args, policy: configured };
|
|
357
|
+
const selected = (0, scoped_execution_1.parseScopedArguments)(toolName, args);
|
|
270
358
|
const declared = selected === args ? registryManager.getDeclaredArguments(toolName, action) : undefined;
|
|
271
359
|
const own = declared
|
|
272
360
|
? Object.fromEntries(Object.entries(selected).filter(([name]) => declared.has(name)))
|
|
273
361
|
: selected;
|
|
362
|
+
const operatorRejection = (0, operator_projects_1.operatorProjectRejection)(own);
|
|
363
|
+
if (operatorRejection) {
|
|
364
|
+
return {
|
|
365
|
+
rejection: (0, tool_result_1.errorToolResult)({ error: operatorRejection }),
|
|
366
|
+
args: selected,
|
|
367
|
+
policy: configured,
|
|
368
|
+
};
|
|
369
|
+
}
|
|
370
|
+
const policy = config_1.GITLAB_ALLOWED_PROJECT_IDS.length > 0
|
|
371
|
+
? await (0, operator_projects_1.withOperatorProjects)(configured, defaults.read, expired, (0, scope_enforcer_1.extractProjectsFromArgs)(own))
|
|
372
|
+
: await (0, scope_ids_1.withScopePaths)(configured, defaults.read);
|
|
373
|
+
const rejection = settingsRejection(toolName, await (0, scope_ids_1.withTargetPaths)(own, defaults.read, policy.scopeEnforcer), policy, registryManager);
|
|
274
374
|
return {
|
|
275
|
-
rejection
|
|
375
|
+
rejection,
|
|
276
376
|
args: selected,
|
|
277
377
|
policy,
|
|
278
378
|
};
|
|
@@ -289,7 +389,10 @@ function settingsRejection(toolName, args, policy, registryManager) {
|
|
|
289
389
|
recordEarlyReturnError(toolName, action, message);
|
|
290
390
|
return (0, tool_result_1.errorToolResult)({ error: message });
|
|
291
391
|
}
|
|
292
|
-
async function executeInScope(registryManager, toolName, requested, policy, instanceUrl, requestScopes) {
|
|
392
|
+
async function executeInScope(registryManager, toolName, requested, policy, instanceUrl, requestScopes, expired) {
|
|
393
|
+
await (0, operator_ownership_1.assertOperatorOwnership)(toolName, requested, policy, expired);
|
|
394
|
+
if (expired())
|
|
395
|
+
throw new Error('Tool call expired before execution');
|
|
293
396
|
const run = (tool, toolArgs) => requestScopes === undefined
|
|
294
397
|
? registryManager.executeTool(tool, toolArgs, instanceUrl)
|
|
295
398
|
: registryManager.executeTool(tool, toolArgs, instanceUrl, requestScopes);
|
|
@@ -412,7 +515,7 @@ async function setupHandlers(server) {
|
|
|
412
515
|
],
|
|
413
516
|
};
|
|
414
517
|
});
|
|
415
|
-
|
|
518
|
+
const listTools = async (extra) => {
|
|
416
519
|
(0, logger_1.logInfo)('ListToolsRequest received');
|
|
417
520
|
const { getSessionManager: getSessionMgr } = await Promise.resolve().then(() => __importStar(require('./session-manager')));
|
|
418
521
|
const sessionMgr = getSessionMgr();
|
|
@@ -501,8 +604,18 @@ async function setupHandlers(server) {
|
|
|
501
604
|
return {
|
|
502
605
|
tools: modifiedTools,
|
|
503
606
|
};
|
|
607
|
+
};
|
|
608
|
+
server.setRequestHandler(types_js_1.ListToolsRequestSchema, async (_request, extra) => {
|
|
609
|
+
try {
|
|
610
|
+
return await (0, chat_accounts_1.withChatAccount)(extra?.sessionId, () => listTools(extra));
|
|
611
|
+
}
|
|
612
|
+
catch (error) {
|
|
613
|
+
if (!(error instanceof chat_accounts_1.AccountUnavailableError))
|
|
614
|
+
throw error;
|
|
615
|
+
return listTools(extra);
|
|
616
|
+
}
|
|
504
617
|
});
|
|
505
|
-
|
|
618
|
+
const callTool = async (request, extra, deadline) => {
|
|
506
619
|
const { getGitLabApiUrlFromContext: getUrlFromCtx, isOAuthEnabled, getTokenContext: getCallContext, } = await Promise.resolve().then(() => __importStar(require('./oauth/index')));
|
|
507
620
|
const oauthEnabled = isOAuthEnabled();
|
|
508
621
|
if (oauthEnabled) {
|
|
@@ -515,21 +628,12 @@ async function setupHandlers(server) {
|
|
|
515
628
|
const oauthContextUrl = oauthEnabled ? getUrlFromCtx() : undefined;
|
|
516
629
|
const requestInstanceUrl = activeInstanceUrl(oauthEnabled, oauthContextUrl);
|
|
517
630
|
const callSessionId = extra?.sessionId;
|
|
518
|
-
if (callSessionId && (
|
|
519
|
-
|
|
520
|
-
getSessionMgrForCall().setSessionInstanceUrl(callSessionId, requestInstanceUrl);
|
|
631
|
+
if (callSessionId && !managesAccounts(request)) {
|
|
632
|
+
await pinSessionInstance(callSessionId, oauthEnabled, oauthContextUrl, requestInstanceUrl);
|
|
521
633
|
}
|
|
522
634
|
const caller = (0, configuration_1.resolveCaller)(callSessionId, requestInstanceUrl);
|
|
523
|
-
let timedOut = false;
|
|
524
635
|
const bootstrapState = { started: false, complete: false };
|
|
525
|
-
const
|
|
526
|
-
let handlerTimeoutId;
|
|
527
|
-
const timeoutPromise = new Promise((resolve) => {
|
|
528
|
-
handlerTimeoutId = setTimeout(() => {
|
|
529
|
-
timedOut = true;
|
|
530
|
-
resolve(HANDLER_TIMEOUT_SYMBOL);
|
|
531
|
-
}, config_1.HANDLER_TIMEOUT_MS);
|
|
532
|
-
});
|
|
636
|
+
const timedOut = deadline.isExpired;
|
|
533
637
|
const handlerWork = async () => {
|
|
534
638
|
if (config_1.LOG_FORMAT === 'verbose') {
|
|
535
639
|
(0, logger_1.logInfo)(`Tool called: ${request.params.name}`);
|
|
@@ -548,16 +652,16 @@ async function setupHandlers(server) {
|
|
|
548
652
|
let toolArguments = request.params.arguments;
|
|
549
653
|
const { RegistryManager: CallRegistry } = await Promise.resolve().then(() => __importStar(require('./registry-manager')));
|
|
550
654
|
const configuration = await (0, configuration_1.getConfigurationService)().resolve(caller);
|
|
551
|
-
const prepared = await prepareScopedCall(toolName, toolArguments ?? {}, configuration.policy, CallRegistry.getInstance());
|
|
655
|
+
const prepared = await prepareScopedCall(toolName, toolArguments ?? {}, configuration.policy, CallRegistry.getInstance(), timedOut);
|
|
552
656
|
if (prepared.rejection)
|
|
553
657
|
return prepared.rejection;
|
|
554
658
|
toolArguments = prepared.args;
|
|
555
659
|
const unreachableResult = checkUnreachableInstance(toolName, toolArguments, effectiveInstanceUrl, healthMonitor);
|
|
556
660
|
if (unreachableResult)
|
|
557
661
|
return unreachableResult;
|
|
558
|
-
const
|
|
559
|
-
if (
|
|
560
|
-
return
|
|
662
|
+
const withoutBootstrap = await tryWithoutBootstrap(request, toolArguments, effectiveInstanceUrl, healthMonitor, callSessionId, requestScopes);
|
|
663
|
+
if (withoutBootstrap)
|
|
664
|
+
return withoutBootstrap;
|
|
561
665
|
const oauthMode = isOAuthEnabled();
|
|
562
666
|
const bootstrapFailure = await ensureBootstrapped({
|
|
563
667
|
toolName,
|
|
@@ -567,7 +671,7 @@ async function setupHandlers(server) {
|
|
|
567
671
|
requestScopes,
|
|
568
672
|
connectionManager,
|
|
569
673
|
healthMonitor,
|
|
570
|
-
isTimedOut:
|
|
674
|
+
isTimedOut: timedOut,
|
|
571
675
|
bootstrapState,
|
|
572
676
|
});
|
|
573
677
|
if (bootstrapFailure)
|
|
@@ -599,51 +703,30 @@ async function setupHandlers(server) {
|
|
|
599
703
|
tool: toolName,
|
|
600
704
|
});
|
|
601
705
|
}
|
|
602
|
-
const result = await executeInScope(registryManager, toolName, toolArguments, prepared.policy, effectiveInstanceUrl, requestScopes);
|
|
706
|
+
const result = await executeInScope(registryManager, toolName, toolArguments, prepared.policy, effectiveInstanceUrl, requestScopes, timedOut);
|
|
603
707
|
if (result === undefined) {
|
|
604
708
|
throw new Error(`Tool '${toolName}' is not available or has been filtered out`);
|
|
605
709
|
}
|
|
606
|
-
if (!timedOut) {
|
|
710
|
+
if (!timedOut()) {
|
|
607
711
|
healthMonitor.reportSuccess(effectiveInstanceUrl);
|
|
608
712
|
}
|
|
609
713
|
return (0, tool_result_1.formatToolResult)(result, definition);
|
|
610
714
|
}
|
|
611
715
|
catch (error) {
|
|
612
|
-
throwDispatchError(error, toolName, effectiveInstanceUrl, healthMonitor, timedOut);
|
|
716
|
+
throwDispatchError(error, toolName, effectiveInstanceUrl, healthMonitor, timedOut());
|
|
613
717
|
}
|
|
614
718
|
};
|
|
615
719
|
try {
|
|
616
|
-
const result = await Promise.race([(0, configuration_1.runWithCaller)(caller, handlerWork),
|
|
617
|
-
if (result ===
|
|
618
|
-
|
|
619
|
-
const action = request.params.arguments && typeof request.params.arguments.action === 'string'
|
|
620
|
-
? request.params.arguments.action
|
|
621
|
-
: 'unknown';
|
|
622
|
-
const retryable = isIdempotentOperation(toolName, declaredIdempotent);
|
|
623
|
-
const timeoutError = (0, error_handler_1.createTimeoutError)(toolName, action, config_1.HANDLER_TIMEOUT_MS, retryable);
|
|
624
|
-
(0, logger_1.logError)(`Handler timeout: tool '${toolName}' timed out after ${config_1.HANDLER_TIMEOUT_MS}ms`);
|
|
625
|
-
if (bootstrapState.started && !bootstrapState.complete) {
|
|
626
|
-
HealthMonitor_1.HealthMonitor.getInstance().reportError(requestInstanceUrl, new Error(`Handler timed out after ${config_1.HANDLER_TIMEOUT_MS}ms — bootstrap did not complete`));
|
|
627
|
-
ConnectionManager_1.ConnectionManager.getInstance().clearInflight(requestInstanceUrl);
|
|
628
|
-
}
|
|
629
|
-
recordEarlyReturnError(toolName, action, timeoutError.message);
|
|
630
|
-
return (0, tool_result_1.errorToolResult)(timeoutError);
|
|
720
|
+
const result = await Promise.race([(0, configuration_1.runWithCaller)(caller, handlerWork), deadline.expired]);
|
|
721
|
+
if (result === HANDLER_TIMEOUT) {
|
|
722
|
+
return handlerTimeoutResult(request, declaredIdempotent, bootstrapState, requestInstanceUrl);
|
|
631
723
|
}
|
|
632
724
|
return result;
|
|
633
725
|
}
|
|
634
726
|
catch (error) {
|
|
635
727
|
const errMsg = error instanceof Error ? error.message : String(error);
|
|
636
728
|
(0, logger_1.logError)(`Error in tool handler: ${errMsg}`);
|
|
637
|
-
|
|
638
|
-
reqTracker.setErrorForCurrentRequest(errMsg);
|
|
639
|
-
const curRequestId = (0, index_1.getCurrentRequestId)();
|
|
640
|
-
if (curRequestId) {
|
|
641
|
-
const stack = reqTracker.getStack(curRequestId);
|
|
642
|
-
if (stack?.sessionId) {
|
|
643
|
-
const connTracker = (0, index_1.getConnectionTracker)();
|
|
644
|
-
connTracker.recordError(stack.sessionId, errMsg);
|
|
645
|
-
}
|
|
646
|
-
}
|
|
729
|
+
recordToolError(errMsg);
|
|
647
730
|
const toolName = request.params.name;
|
|
648
731
|
const toolArgs = request.params.arguments;
|
|
649
732
|
const structuredError = toStructuredError(error, toolName, toolArgs, declaredIdempotent);
|
|
@@ -654,9 +737,36 @@ async function setupHandlers(server) {
|
|
|
654
737
|
const errorMessage = error instanceof Error ? error.message : String(error);
|
|
655
738
|
return (0, tool_auth_1.withReauthChallenge)((0, tool_result_1.errorToolResult)({ error: errorMessage }), error);
|
|
656
739
|
}
|
|
740
|
+
};
|
|
741
|
+
server.setRequestHandler(types_js_1.CallToolRequestSchema, (request, extra) => (0, mcp_server_context_1.runWithMcpServer)(server, async () => {
|
|
742
|
+
const deadline = startCallDeadline();
|
|
743
|
+
try {
|
|
744
|
+
if (managesAccounts(request))
|
|
745
|
+
return await callTool(request, extra, deadline);
|
|
746
|
+
let running = false;
|
|
747
|
+
const call = (0, chat_accounts_1.withChatAccount)(extra?.sessionId, async () => {
|
|
748
|
+
if (deadline.isExpired())
|
|
749
|
+
return undefined;
|
|
750
|
+
running = true;
|
|
751
|
+
return callTool(request, extra, deadline);
|
|
752
|
+
});
|
|
753
|
+
const first = await Promise.race([call, deadline.expired]);
|
|
754
|
+
if (first !== HANDLER_TIMEOUT && first !== undefined)
|
|
755
|
+
return first;
|
|
756
|
+
const answered = running ? await call : undefined;
|
|
757
|
+
if (answered)
|
|
758
|
+
return answered;
|
|
759
|
+
call.catch((error) => (0, logger_1.logDebug)('Account resolution failed after the call timed out', { err: error }));
|
|
760
|
+
return handlerTimeoutResult(request, undefined, { started: false, complete: false }, config_1.GITLAB_BASE_URL);
|
|
761
|
+
}
|
|
762
|
+
catch (error) {
|
|
763
|
+
if (!(error instanceof chat_accounts_1.AccountUnavailableError))
|
|
764
|
+
throw error;
|
|
765
|
+
return (0, tool_result_1.errorToolResult)({ error: error.message });
|
|
766
|
+
}
|
|
657
767
|
finally {
|
|
658
|
-
|
|
768
|
+
deadline.clear();
|
|
659
769
|
}
|
|
660
|
-
});
|
|
770
|
+
}));
|
|
661
771
|
}
|
|
662
772
|
//# sourceMappingURL=handlers.js.map
|