@structured-world/gitlab-mcp 10.1.0 → 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 +7 -7
- 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 +6 -4
- package/dist/src/entities/mrs/registry.js.map +1 -1
- package/dist/src/entities/mrs/schema-readonly.d.ts +2 -2
- package/dist/src/entities/mrs/schema-readonly.js +19 -2
- 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/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 +60 -13
- 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
|
@@ -26,6 +26,7 @@ exports.addInstance = addInstance;
|
|
|
26
26
|
exports.removeInstance = removeInstance;
|
|
27
27
|
exports.initDockerConfig = initDockerConfig;
|
|
28
28
|
exports.saveEnvFile = saveEnvFile;
|
|
29
|
+
exports.mergeEnvFile = mergeEnvFile;
|
|
29
30
|
const child_process_1 = require("child_process");
|
|
30
31
|
const crypto_1 = require("crypto");
|
|
31
32
|
const fs_1 = require("fs");
|
|
@@ -132,21 +133,51 @@ function getDockerStatus(containerName = 'gitlab-mcp') {
|
|
|
132
133
|
result.instances = loadInstances();
|
|
133
134
|
return result;
|
|
134
135
|
}
|
|
136
|
+
const BUNDLED_POSTGRESQL_URL = 'postgresql://gitlab_mcp:${POSTGRES_PASSWORD}@postgres:5432/gitlab_mcp';
|
|
137
|
+
function sessionDatabaseUrl(config) {
|
|
138
|
+
if (!config.oauthEnabled)
|
|
139
|
+
return undefined;
|
|
140
|
+
if (config.deploymentType === 'compose-bundle')
|
|
141
|
+
return BUNDLED_POSTGRESQL_URL;
|
|
142
|
+
if (config.deploymentType === 'external-db') {
|
|
143
|
+
if (!config.databaseUrl) {
|
|
144
|
+
throw new Error('An external-db deployment with OAuth needs the PostgreSQL connection URL');
|
|
145
|
+
}
|
|
146
|
+
return '${OAUTH_STORAGE_POSTGRESQL_URL}';
|
|
147
|
+
}
|
|
148
|
+
return undefined;
|
|
149
|
+
}
|
|
150
|
+
const CORE_IMAGE_REPOSITORY = 'ghcr.io/structured-world/gitlab-mcp';
|
|
151
|
+
function databaseImage(image) {
|
|
152
|
+
if (image !== CORE_IMAGE_REPOSITORY && !image.startsWith(`${CORE_IMAGE_REPOSITORY}:`)) {
|
|
153
|
+
if (!image.startsWith(`${CORE_IMAGE_REPOSITORY}@`))
|
|
154
|
+
return image;
|
|
155
|
+
throw new Error('Pin the gitlab-mcp-db image by tag or digest for a PostgreSQL deployment');
|
|
156
|
+
}
|
|
157
|
+
return image.replace(CORE_IMAGE_REPOSITORY, `${CORE_IMAGE_REPOSITORY}-db`);
|
|
158
|
+
}
|
|
159
|
+
function envLiteralUrl(url) {
|
|
160
|
+
return `'${url.replaceAll("'", '%27')}'`;
|
|
161
|
+
}
|
|
135
162
|
function generateDockerCompose(config) {
|
|
163
|
+
const databaseUrl = sessionDatabaseUrl(config);
|
|
164
|
+
const image = databaseUrl ? databaseImage(config.image) : config.image;
|
|
165
|
+
const environment = [
|
|
166
|
+
'TRANSPORT=sse',
|
|
167
|
+
'HOST=0.0.0.0',
|
|
168
|
+
'PORT=3333',
|
|
169
|
+
`OAUTH_ENABLED=${config.oauthEnabled}`,
|
|
170
|
+
];
|
|
171
|
+
const volumes = ['gitlab-mcp-data:/data'];
|
|
136
172
|
const compose = {
|
|
137
173
|
version: '3.8',
|
|
138
174
|
services: {
|
|
139
175
|
'gitlab-mcp': {
|
|
140
|
-
image
|
|
176
|
+
image,
|
|
141
177
|
container_name: config.containerName,
|
|
142
178
|
ports: [`\${PORT:-${config.port}}:3333`],
|
|
143
|
-
environment
|
|
144
|
-
|
|
145
|
-
'HOST=0.0.0.0',
|
|
146
|
-
'PORT=3333',
|
|
147
|
-
`OAUTH_ENABLED=${config.oauthEnabled}`,
|
|
148
|
-
],
|
|
149
|
-
volumes: ['gitlab-mcp-data:/data'],
|
|
179
|
+
environment,
|
|
180
|
+
volumes,
|
|
150
181
|
restart: 'unless-stopped',
|
|
151
182
|
},
|
|
152
183
|
},
|
|
@@ -154,6 +185,29 @@ function generateDockerCompose(config) {
|
|
|
154
185
|
'gitlab-mcp-data': {},
|
|
155
186
|
},
|
|
156
187
|
};
|
|
188
|
+
if (config.oauthEnabled) {
|
|
189
|
+
environment.push('OAUTH_SESSION_SECRET=${OAUTH_SESSION_SECRET}', 'OAUTH_ISSUER=${OAUTH_ISSUER}');
|
|
190
|
+
if (databaseUrl) {
|
|
191
|
+
environment.push('OAUTH_STORAGE_TYPE=postgresql', `OAUTH_STORAGE_POSTGRESQL_URL=${databaseUrl}`);
|
|
192
|
+
}
|
|
193
|
+
else {
|
|
194
|
+
environment.push('OAUTH_STORAGE_TYPE=file', 'OAUTH_STORAGE_FILE_PATH=/data/oauth-sessions.json');
|
|
195
|
+
}
|
|
196
|
+
compose.services['gitlab-mcp'].env_file = ['.env', INSTANCES_ENV_FILE];
|
|
197
|
+
}
|
|
198
|
+
if (databaseUrl) {
|
|
199
|
+
compose.services.migrate = {
|
|
200
|
+
image,
|
|
201
|
+
restart: 'no',
|
|
202
|
+
working_dir: '/app/node_modules/@structured-world/gitlab-mcp-db',
|
|
203
|
+
entrypoint: ['node', 'dist/src/migrate.js'],
|
|
204
|
+
environment: [`OAUTH_STORAGE_POSTGRESQL_URL=${databaseUrl}`],
|
|
205
|
+
...(config.deploymentType === 'compose-bundle' && { depends_on: ['postgres'] }),
|
|
206
|
+
};
|
|
207
|
+
compose.services['gitlab-mcp'].depends_on = {
|
|
208
|
+
migrate: { condition: 'service_completed_successfully' },
|
|
209
|
+
};
|
|
210
|
+
}
|
|
157
211
|
if (config.deploymentType === 'compose-bundle' && config.oauthEnabled) {
|
|
158
212
|
compose.services.postgres = {
|
|
159
213
|
image: 'postgres:16-alpine',
|
|
@@ -166,26 +220,20 @@ function generateDockerCompose(config) {
|
|
|
166
220
|
],
|
|
167
221
|
volumes: ['postgres-data:/var/lib/postgresql/data'],
|
|
168
222
|
restart: 'unless-stopped',
|
|
223
|
+
healthcheck: {
|
|
224
|
+
test: ['CMD-SHELL', 'pg_isready -U gitlab_mcp'],
|
|
225
|
+
interval: '5s',
|
|
226
|
+
timeout: '5s',
|
|
227
|
+
retries: 5,
|
|
228
|
+
},
|
|
169
229
|
};
|
|
170
|
-
compose.services['gitlab-mcp'].depends_on = ['postgres'];
|
|
171
230
|
if (compose.volumes) {
|
|
172
231
|
compose.volumes['postgres-data'] = {};
|
|
173
232
|
}
|
|
174
233
|
}
|
|
175
|
-
if (config.oauthEnabled) {
|
|
176
|
-
let databaseUrl;
|
|
177
|
-
if (config.deploymentType === 'compose-bundle') {
|
|
178
|
-
databaseUrl = 'postgresql://gitlab_mcp:${POSTGRES_PASSWORD}@postgres:5432/gitlab_mcp';
|
|
179
|
-
}
|
|
180
|
-
else {
|
|
181
|
-
databaseUrl = config.databaseUrl ?? 'file:/data/sessions.db';
|
|
182
|
-
}
|
|
183
|
-
compose.services['gitlab-mcp'].environment.push('OAUTH_SESSION_SECRET=${OAUTH_SESSION_SECRET}', `DATABASE_URL=${databaseUrl}`);
|
|
184
|
-
compose.services['gitlab-mcp'].volumes.push('./instances.yml:/app/config/instances.yml:ro');
|
|
185
|
-
}
|
|
186
234
|
if (config.environment) {
|
|
187
235
|
for (const [key, value] of Object.entries(config.environment)) {
|
|
188
|
-
|
|
236
|
+
environment.push(`${key}=${value}`);
|
|
189
237
|
}
|
|
190
238
|
}
|
|
191
239
|
return yaml_1.default.stringify(compose);
|
|
@@ -243,6 +291,32 @@ function saveInstances(instances) {
|
|
|
243
291
|
const instancesPath = (0, path_1.join)(configDir, 'instances.yml');
|
|
244
292
|
const content = generateInstancesYaml(instances);
|
|
245
293
|
(0, fs_1.writeFileSync)(instancesPath, content, 'utf8');
|
|
294
|
+
saveServerInstances(instances);
|
|
295
|
+
}
|
|
296
|
+
const INSTANCES_ENV_FILE = 'instances.env';
|
|
297
|
+
const JSON_QUOTE_ESCAPE = `${String.fromCodePoint(92)}u0027`;
|
|
298
|
+
function saveServerInstances(instances) {
|
|
299
|
+
const configDir = getExpandedConfigDir();
|
|
300
|
+
if (!(0, fs_1.existsSync)(configDir)) {
|
|
301
|
+
(0, fs_1.mkdirSync)(configDir, { recursive: true });
|
|
302
|
+
}
|
|
303
|
+
let value = '';
|
|
304
|
+
if (instances.length > 0) {
|
|
305
|
+
const config = {
|
|
306
|
+
instances: instances.map((instance) => ({
|
|
307
|
+
url: instance.host.includes('://') ? instance.host : `https://${instance.host}`,
|
|
308
|
+
label: instance.name,
|
|
309
|
+
...(instance.oauth && {
|
|
310
|
+
oauth: {
|
|
311
|
+
clientId: instance.oauth.clientId,
|
|
312
|
+
clientSecretEnv: instance.oauth.clientSecretEnv,
|
|
313
|
+
},
|
|
314
|
+
}),
|
|
315
|
+
})),
|
|
316
|
+
};
|
|
317
|
+
value = `'${JSON.stringify(config).replaceAll("'", JSON_QUOTE_ESCAPE)}'`;
|
|
318
|
+
}
|
|
319
|
+
(0, fs_1.writeFileSync)((0, path_1.join)(configDir, INSTANCES_ENV_FILE), `GITLAB_INSTANCES=${value}\n`, 'utf8');
|
|
246
320
|
}
|
|
247
321
|
function saveDockerCompose(config) {
|
|
248
322
|
const configDir = getExpandedConfigDir();
|
|
@@ -363,6 +437,9 @@ function initDockerConfig(config = {}) {
|
|
|
363
437
|
if (fullConfig.instances.length > 0) {
|
|
364
438
|
saveInstances(fullConfig.instances);
|
|
365
439
|
}
|
|
440
|
+
else if (fullConfig.oauthEnabled) {
|
|
441
|
+
saveServerInstances([]);
|
|
442
|
+
}
|
|
366
443
|
return fullConfig;
|
|
367
444
|
}
|
|
368
445
|
function saveEnvFile(config) {
|
|
@@ -370,17 +447,50 @@ function saveEnvFile(config) {
|
|
|
370
447
|
if (!(0, fs_1.existsSync)(configDir)) {
|
|
371
448
|
(0, fs_1.mkdirSync)(configDir, { recursive: true });
|
|
372
449
|
}
|
|
373
|
-
const
|
|
450
|
+
const managed = new Map();
|
|
374
451
|
if (config.oauthSessionSecret) {
|
|
375
|
-
|
|
452
|
+
managed.set('OAUTH_SESSION_SECRET', config.oauthSessionSecret);
|
|
453
|
+
}
|
|
454
|
+
if (config.oauthEnabled) {
|
|
455
|
+
managed.set('OAUTH_ISSUER', config.oauthIssuer ?? `http://localhost:${config.port}`);
|
|
376
456
|
}
|
|
377
457
|
if (config.deploymentType === 'compose-bundle' && config.oauthEnabled) {
|
|
378
|
-
|
|
379
|
-
lines.push(`POSTGRES_PASSWORD=${pgPassword}`);
|
|
458
|
+
managed.set('POSTGRES_PASSWORD', (0, crypto_1.randomBytes)(24).toString('base64url'));
|
|
380
459
|
}
|
|
381
|
-
if (
|
|
460
|
+
if (config.deploymentType === 'external-db' && config.oauthEnabled && config.databaseUrl) {
|
|
461
|
+
managed.set('OAUTH_STORAGE_POSTGRESQL_URL', envLiteralUrl(config.databaseUrl));
|
|
462
|
+
}
|
|
463
|
+
if (managed.size > 0) {
|
|
382
464
|
const envPath = (0, path_1.join)(configDir, '.env');
|
|
383
|
-
|
|
465
|
+
let existing = '';
|
|
466
|
+
if ((0, fs_1.existsSync)(envPath)) {
|
|
467
|
+
(0, fs_1.chmodSync)(envPath, 0o600);
|
|
468
|
+
existing = (0, fs_1.readFileSync)(envPath, 'utf8');
|
|
469
|
+
}
|
|
470
|
+
(0, fs_1.writeFileSync)(envPath, mergeEnvFile(existing, managed), { encoding: 'utf8', mode: 0o600 });
|
|
471
|
+
}
|
|
472
|
+
}
|
|
473
|
+
const GENERATED_ENV_KEYS = new Set(['OAUTH_SESSION_SECRET', 'POSTGRES_PASSWORD']);
|
|
474
|
+
function envLineKey(line) {
|
|
475
|
+
return /^\s*(?:export\s+)?([A-Za-z_]\w*)\s*=/.exec(line)?.[1];
|
|
476
|
+
}
|
|
477
|
+
function mergeEnvFile(existing, managed) {
|
|
478
|
+
const written = new Set();
|
|
479
|
+
const lines = existing === '' ? [] : existing.replace(/\n$/, '').split('\n');
|
|
480
|
+
const merged = lines.flatMap((line) => {
|
|
481
|
+
const key = envLineKey(line);
|
|
482
|
+
const value = key === undefined ? undefined : managed.get(key);
|
|
483
|
+
if (key === undefined || value === undefined)
|
|
484
|
+
return [line];
|
|
485
|
+
if (written.has(key))
|
|
486
|
+
return [];
|
|
487
|
+
written.add(key);
|
|
488
|
+
return [GENERATED_ENV_KEYS.has(key) ? line : `${key}=${value}`];
|
|
489
|
+
});
|
|
490
|
+
for (const [key, value] of managed) {
|
|
491
|
+
if (!written.has(key))
|
|
492
|
+
merged.push(`${key}=${value}`);
|
|
384
493
|
}
|
|
494
|
+
return merged.join('\n') + '\n';
|
|
385
495
|
}
|
|
386
496
|
//# sourceMappingURL=docker-utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"docker-utils.js","sourceRoot":"","sources":["../../../../src/cli/docker/docker-utils.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"docker-utils.js","sourceRoot":"","sources":["../../../../src/cli/docker/docker-utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,47 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
19
|
+
var ownKeys = function(o) {
|
|
20
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
+
var ar = [];
|
|
22
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
+
return ar;
|
|
24
|
+
};
|
|
25
|
+
return ownKeys(o);
|
|
26
|
+
};
|
|
27
|
+
return function (mod) {
|
|
28
|
+
if (mod && mod.__esModule) return mod;
|
|
29
|
+
var result = {};
|
|
30
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
+
__setModuleDefault(result, mod);
|
|
32
|
+
return result;
|
|
33
|
+
};
|
|
34
|
+
})();
|
|
35
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
|
+
exports.promptOAuthIssuer = promptOAuthIssuer;
|
|
37
|
+
const p = __importStar(require("@clack/prompts"));
|
|
38
|
+
const config_1 = require("../../oauth/config");
|
|
39
|
+
function promptOAuthIssuer(port) {
|
|
40
|
+
return p.text({
|
|
41
|
+
message: 'Public URL clients connect to (OAUTH_ISSUER):',
|
|
42
|
+
placeholder: 'https://mcp.example.com',
|
|
43
|
+
initialValue: `http://localhost:${port}`,
|
|
44
|
+
validate: (value) => (0, config_1.issuerValidationError)(value ?? ''),
|
|
45
|
+
});
|
|
46
|
+
}
|
|
47
|
+
//# sourceMappingURL=oauth-issuer-prompt.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"oauth-issuer-prompt.js","sourceRoot":"","sources":["../../../../src/cli/docker/oauth-issuer-prompt.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAYA,8CAOC;AAfD,kDAAoC;AACpC,+CAA2D;AAO3D,SAAgB,iBAAiB,CAAC,IAAY;IAC5C,OAAO,CAAC,CAAC,IAAI,CAAC;QACZ,OAAO,EAAE,+CAA+C;QACxD,WAAW,EAAE,yBAAyB;QACtC,YAAY,EAAE,oBAAoB,IAAI,EAAE;QACxC,QAAQ,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,IAAA,8BAAqB,EAAC,KAAK,IAAI,EAAE,CAAC;KACxD,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -4,6 +4,8 @@ export interface ContainerRuntimeInfo {
|
|
|
4
4
|
runtimeCmd: string;
|
|
5
5
|
runtimeAvailable: boolean;
|
|
6
6
|
composeCmd: string[] | null;
|
|
7
|
+
composeProvider?: 'docker-compose' | 'podman-compose';
|
|
8
|
+
composeVersion?: string;
|
|
7
9
|
runtimeVersion?: string;
|
|
8
10
|
}
|
|
9
11
|
export type ContainerStatus = 'running' | 'stopped' | 'paused' | 'restarting' | 'created' | 'exited' | 'dead';
|
|
@@ -31,6 +33,7 @@ export interface DockerConfig {
|
|
|
31
33
|
deploymentType?: 'standalone' | 'external-db' | 'compose-bundle';
|
|
32
34
|
oauthEnabled: boolean;
|
|
33
35
|
oauthSessionSecret?: string;
|
|
36
|
+
oauthIssuer?: string;
|
|
34
37
|
databaseUrl?: string;
|
|
35
38
|
environment?: Record<string, string>;
|
|
36
39
|
instances: GitLabInstance[];
|
|
@@ -40,12 +43,23 @@ export interface DockerConfig {
|
|
|
40
43
|
export declare const DEFAULT_DOCKER_CONFIG: DockerConfig;
|
|
41
44
|
export interface DockerComposeService {
|
|
42
45
|
image: string;
|
|
43
|
-
container_name
|
|
44
|
-
ports
|
|
46
|
+
container_name?: string;
|
|
47
|
+
ports?: string[];
|
|
45
48
|
environment: string[];
|
|
46
|
-
volumes
|
|
49
|
+
volumes?: string[];
|
|
47
50
|
restart: string;
|
|
48
|
-
|
|
51
|
+
working_dir?: string;
|
|
52
|
+
entrypoint?: string[];
|
|
53
|
+
env_file?: string[];
|
|
54
|
+
depends_on?: string[] | Record<string, {
|
|
55
|
+
condition: 'service_completed_successfully';
|
|
56
|
+
}>;
|
|
57
|
+
healthcheck?: {
|
|
58
|
+
test: string[];
|
|
59
|
+
interval: string;
|
|
60
|
+
timeout: string;
|
|
61
|
+
retries: number;
|
|
62
|
+
};
|
|
49
63
|
}
|
|
50
64
|
export interface DockerComposeFile {
|
|
51
65
|
version: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../src/cli/docker/types.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../src/cli/docker/types.ts"],"names":[],"mappings":";;;AA+LA,oCAGC;AA/FY,QAAA,qBAAqB,GAAiB;IACjD,IAAI,EAAE,IAAI;IACV,YAAY,EAAE,KAAK;IACnB,SAAS,EAAE,EAAE;IACb,aAAa,EAAE,YAAY;IAC3B,KAAK,EAAE,4CAA4C;CACpD,CAAC;AA6EW,QAAA,YAAY,GAAG;IAC1B,MAAM,EAAE,sBAAsB;IAC9B,KAAK,EAAE,sBAAsB;IAC7B,KAAK,EAAE,sBAAsB;CACrB,CAAC;AAKX,SAAgB,YAAY;IAC1B,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAwC,CAAC;IAClE,OAAO,oBAAY,CAAC,QAAQ,CAAC,IAAI,oBAAY,CAAC,KAAK,CAAC;AACtD,CAAC"}
|
|
@@ -813,33 +813,18 @@ const FEATURE_TO_TOOLS = {
|
|
|
813
813
|
};
|
|
814
814
|
const FEATURE_NAMES = Object.keys(FEATURE_TO_TOOLS);
|
|
815
815
|
function countToolsForPreset(preset, allToolNames) {
|
|
816
|
-
|
|
817
|
-
|
|
818
|
-
|
|
819
|
-
|
|
820
|
-
|
|
821
|
-
|
|
822
|
-
|
|
823
|
-
enabledTools = enabledTools.filter((name) => !regex.test(name));
|
|
824
|
-
}
|
|
825
|
-
catch (error) {
|
|
826
|
-
console.warn(`Warning: invalid denied_tools_regex "${preset.denied_tools_regex}": ${error instanceof Error ? error.message : 'unknown error'}`);
|
|
827
|
-
}
|
|
816
|
+
return getToolsForPreset(preset, allToolNames).enabled.length;
|
|
817
|
+
}
|
|
818
|
+
function presetDenyPattern(preset) {
|
|
819
|
+
if (!preset.denied_tools_regex || preset.allowed_tools?.length)
|
|
820
|
+
return undefined;
|
|
821
|
+
try {
|
|
822
|
+
return new RegExp(preset.denied_tools_regex);
|
|
828
823
|
}
|
|
829
|
-
|
|
830
|
-
|
|
831
|
-
|
|
824
|
+
catch (error) {
|
|
825
|
+
console.warn(`Warning: invalid denied_tools_regex "${preset.denied_tools_regex}": ${error.message}`);
|
|
826
|
+
return undefined;
|
|
832
827
|
}
|
|
833
|
-
if (preset.features) {
|
|
834
|
-
for (const [feature, tools] of Object.entries(FEATURE_TO_TOOLS)) {
|
|
835
|
-
const featureKey = feature;
|
|
836
|
-
if (preset.features[featureKey] === false) {
|
|
837
|
-
const toolSet = new Set(tools);
|
|
838
|
-
enabledTools = enabledTools.filter((name) => !toolSet.has(name));
|
|
839
|
-
}
|
|
840
|
-
}
|
|
841
|
-
}
|
|
842
|
-
return enabledTools.length;
|
|
843
828
|
}
|
|
844
829
|
function getToolsForPreset(preset, allToolNames) {
|
|
845
830
|
let enabledTools = [...allToolNames];
|
|
@@ -849,16 +834,10 @@ function getToolsForPreset(preset, allToolNames) {
|
|
|
849
834
|
disabledTools.push(...manageTools);
|
|
850
835
|
enabledTools = enabledTools.filter((name) => !name.startsWith('manage_'));
|
|
851
836
|
}
|
|
852
|
-
|
|
853
|
-
|
|
854
|
-
|
|
855
|
-
|
|
856
|
-
disabledTools.push(...denied);
|
|
857
|
-
enabledTools = enabledTools.filter((name) => !regex.test(name));
|
|
858
|
-
}
|
|
859
|
-
catch (error) {
|
|
860
|
-
console.warn(`Warning: invalid denied_tools_regex "${preset.denied_tools_regex}": ${error instanceof Error ? error.message : 'unknown error'}`);
|
|
861
|
-
}
|
|
837
|
+
const denyPattern = presetDenyPattern(preset);
|
|
838
|
+
if (denyPattern) {
|
|
839
|
+
disabledTools.push(...enabledTools.filter((name) => denyPattern.test(name)));
|
|
840
|
+
enabledTools = enabledTools.filter((name) => !denyPattern.test(name));
|
|
862
841
|
}
|
|
863
842
|
if (preset.allowed_tools && preset.allowed_tools.length > 0) {
|
|
864
843
|
const allowedSet = new Set(preset.allowed_tools);
|