@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
package/README.md
CHANGED
|
@@ -2,9 +2,9 @@
|
|
|
2
2
|
|
|
3
3
|
[](https://www.npmjs.com/package/@structured-world/gitlab-mcp) [](https://www.npmjs.com/package/@structured-world/gitlab-mcp) [](https://github.com/structured-world/gitlab-mcp/blob/HEAD/LICENSE) [](https://github.com/structured-world/gitlab-mcp/actions) [](https://codecov.io/gh/structured-world/gitlab-mcp) [](https://gitlab-mcp.sw.foundation/coverage/)
|
|
4
4
|
|
|
5
|
-
Advanced GitLab MCP server —
|
|
5
|
+
Advanced GitLab MCP server — 64 CQRS tools exposing 230 GitLab operations across 26 entity types. The tool catalog and parameters are filtered to each instance's GitLab version, tier, and token scopes, so the agent sees only what the connected instance actually supports.
|
|
6
6
|
|
|
7
|
-
[](https://gitlab-mcp.sw.foundation/downloads/gitlab-mcp-
|
|
7
|
+
[](https://gitlab-mcp.sw.foundation/downloads/gitlab-mcp-11.0.0.mcpb)
|
|
8
8
|
[](vscode:mcp/install?%7B%22name%22%3A%22gitlab-mcp%22%2C%22command%22%3A%22npx%22%2C%22args%22%3A%5B%22-y%22%2C%22%40structured-world%2Fgitlab-mcp%22%5D%7D)
|
|
9
9
|
[](vscode-insiders:mcp/install?%7B%22name%22%3A%22gitlab-mcp%22%2C%22command%22%3A%22npx%22%2C%22args%22%3A%5B%22-y%22%2C%22%40structured-world%2Fgitlab-mcp%22%5D%7D)
|
|
10
10
|
|
|
@@ -36,7 +36,7 @@ This is a monorepo with two npm packages:
|
|
|
36
36
|
|
|
37
37
|
## Highlights
|
|
38
38
|
|
|
39
|
-
- **
|
|
39
|
+
- **64 tools** across 26 entity types — projects, merge requests, pipelines, work items, wiki, and more
|
|
40
40
|
- **CQRS architecture** — `browse_*` for queries, `manage_*` for commands
|
|
41
41
|
- **Connection resilience** — Bounded startup, auto-reconnect with exponential backoff, disconnected mode when GitLab is unreachable
|
|
42
42
|
- **Multi-instance support** — Connect to GitLab.com, self-managed, and self-hosted instances with per-instance OAuth and rate limiting
|
|
@@ -51,8 +51,8 @@ This is a monorepo with two npm packages:
|
|
|
51
51
|
|
|
52
52
|
GitLab exposes hundreds of API operations. Giving each its own MCP tool floods an
|
|
53
53
|
agent's context; a thin API wrapper pushes that complexity back onto the agent. This
|
|
54
|
-
server takes a third path:
|
|
55
|
-
actions, expose
|
|
54
|
+
server takes a third path: 64 CQRS tools, each holding several typed
|
|
55
|
+
actions, expose 230 operations across 26 entity types.
|
|
56
56
|
|
|
57
57
|
- `browse_*` tools are read-only queries; `manage_*` tools are writes.
|
|
58
58
|
- Sub-resources fold into actions rather than new tools — `browse_pipelines` covers
|
|
@@ -77,7 +77,7 @@ Full documentation is available at **[gitlab-mcp.sw.foundation](https://gitlab-m
|
|
|
77
77
|
| [Installation](https://gitlab-mcp.sw.foundation/guide/installation/npm) | npm, Docker, VS Code, Codex |
|
|
78
78
|
| [Configuration](https://gitlab-mcp.sw.foundation/guide/configuration) | Environment variables, feature flags |
|
|
79
79
|
| [Multi-Instance](https://gitlab-mcp.sw.foundation/guide/multi-instance) | Connect to multiple GitLab instances |
|
|
80
|
-
| [Tool Reference](https://gitlab-mcp.sw.foundation/tools/) | All
|
|
80
|
+
| [Tool Reference](https://gitlab-mcp.sw.foundation/tools/) | All 64 tools with parameters |
|
|
81
81
|
| [OAuth Setup](https://gitlab-mcp.sw.foundation/security/oauth) | Team authentication with Claude |
|
|
82
82
|
| [TLS/HTTPS](https://gitlab-mcp.sw.foundation/advanced/tls) | Production deployment with SSL |
|
|
83
83
|
| [Customization](https://gitlab-mcp.sw.foundation/advanced/customization) | Tool descriptions, action filtering |
|
|
@@ -114,7 +114,7 @@ docker run -i --rm -e GITLAB_TOKEN=your_token \
|
|
|
114
114
|
The server handles GitLab connectivity issues gracefully:
|
|
115
115
|
|
|
116
116
|
- **Bounded startup** — Server starts within `GITLAB_INIT_TIMEOUT_MS` (default 5s) regardless of GitLab availability
|
|
117
|
-
- **Disconnected mode** — When GitLab is unreachable (`disconnected`/`failed` state), only the `manage_context` tool is exposed, with local actions such as `whoami`, `
|
|
117
|
+
- **Disconnected mode** — When GitLab is unreachable (`disconnected`/`failed` state), only the `manage_context` tool is exposed, with local actions such as `whoami`, `switch_preset`, and `set_scope` for diagnostics. During active reconnect (`connecting` state), the full tool list remains available so MCP clients don't lose their tool catalog during brief outages. MCP clients are notified of tool availability changes via `tools/list_changed`
|
|
118
118
|
- **Auto-reconnect** — Exponential backoff reconnection (5s → 60s) with ±10% jitter
|
|
119
119
|
- **Error classification** — Transient errors (network, 5xx, timeouts) trigger auto-reconnect. Auth/config errors at startup transition to `failed` state (no auto-reconnect). Mid-session token revocation is detected via an authenticated `HEAD /api/v4/user` check that runs alongside each periodic health check (static token mode only; skipped in OAuth mode). A 401 or 403 on this check transitions the instance to `failed` state immediately.
|
|
120
120
|
- **Instance health monitor** — Each monitored instance URL has its own XState state machine. Untracked OAuth URLs currently pass through as reachable.
|
package/README.md.in
CHANGED
|
@@ -114,7 +114,7 @@ docker run -i --rm -e GITLAB_TOKEN=your_token \
|
|
|
114
114
|
The server handles GitLab connectivity issues gracefully:
|
|
115
115
|
|
|
116
116
|
- **Bounded startup** — Server starts within `GITLAB_INIT_TIMEOUT_MS` (default 5s) regardless of GitLab availability
|
|
117
|
-
- **Disconnected mode** — When GitLab is unreachable (`disconnected`/`failed` state), only the `manage_context` tool is exposed, with local actions such as `whoami`, `
|
|
117
|
+
- **Disconnected mode** — When GitLab is unreachable (`disconnected`/`failed` state), only the `manage_context` tool is exposed, with local actions such as `whoami`, `switch_preset`, and `set_scope` for diagnostics. During active reconnect (`connecting` state), the full tool list remains available so MCP clients don't lose their tool catalog during brief outages. MCP clients are notified of tool availability changes via `tools/list_changed`
|
|
118
118
|
- **Auto-reconnect** — Exponential backoff reconnection (5s → 60s) with ±10% jitter
|
|
119
119
|
- **Error classification** — Transient errors (network, 5xx, timeouts) trigger auto-reconnect. Auth/config errors at startup transition to `failed` state (no auto-reconnect). Mid-session token revocation is detected via an authenticated `HEAD /api/v4/user` check that runs alongside each periodic health check (static token mode only; skipped in OAuth mode). A 401 or 403 on this check transitions the instance to `failed` state immediately.
|
|
120
120
|
- **Instance health monitor** — Each monitored instance URL has its own XState state machine. Untracked OAuth URLs currently pass through as reachable.
|
|
@@ -50,7 +50,13 @@ const DeploymentSchema = z.object({
|
|
|
50
50
|
environment: z.object({ name: z.string() }).optional(),
|
|
51
51
|
});
|
|
52
52
|
function parseToolResult(result) {
|
|
53
|
-
if (result
|
|
53
|
+
if (!result || typeof result !== 'object')
|
|
54
|
+
return result;
|
|
55
|
+
if ('isError' in result && result.isError === true)
|
|
56
|
+
return null;
|
|
57
|
+
if ('structuredContent' in result)
|
|
58
|
+
return result.structuredContent;
|
|
59
|
+
if ('content' in result) {
|
|
54
60
|
const content = result.content;
|
|
55
61
|
const text = Array.isArray(content) ? content.find((c) => c.type === 'text')?.text : undefined;
|
|
56
62
|
if (typeof text === 'string') {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"format.js","sourceRoot":"","sources":["../../../src/channel-gateway/format.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAuBA,
|
|
1
|
+
{"version":3,"file":"format.js","sourceRoot":"","sources":["../../../src/channel-gateway/format.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,14 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.DownstreamDisconnectedError = void 0;
|
|
3
4
|
exports.forwardWithPolicy = forwardWithPolicy;
|
|
4
5
|
exports.isReadCall = isReadCall;
|
|
6
|
+
class DownstreamDisconnectedError extends Error {
|
|
7
|
+
constructor(cause) {
|
|
8
|
+
super('Downstream connection closed', { cause });
|
|
9
|
+
}
|
|
10
|
+
}
|
|
11
|
+
exports.DownstreamDisconnectedError = DownstreamDisconnectedError;
|
|
5
12
|
async function forwardWithPolicy(policy, name, args) {
|
|
6
13
|
if (!policy.isConnected()) {
|
|
7
14
|
await policy.waitForConnection();
|
|
@@ -10,7 +17,7 @@ async function forwardWithPolicy(policy, name, args) {
|
|
|
10
17
|
return await policy.call(name, args);
|
|
11
18
|
}
|
|
12
19
|
catch (err) {
|
|
13
|
-
if (policy.isRead(name)) {
|
|
20
|
+
if (policy.isRead(name) && err instanceof DownstreamDisconnectedError) {
|
|
14
21
|
await policy.waitForConnection();
|
|
15
22
|
return await policy.call(name, args);
|
|
16
23
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"forwarding.js","sourceRoot":"","sources":["../../../src/channel-gateway/forwarding.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"forwarding.js","sourceRoot":"","sources":["../../../src/channel-gateway/forwarding.ts"],"names":[],"mappings":";;;AA0CA,8CAmBC;AAGD,gCAEC;AAnDD,MAAa,2BAA4B,SAAQ,KAAK;IACpD,YAAY,KAAc;QACxB,KAAK,CAAC,8BAA8B,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;IACnD,CAAC;CACF;AAJD,kEAIC;AAuBM,KAAK,UAAU,iBAAiB,CACrC,MAAqB,EACrB,IAAY,EACZ,IAAa;IAGb,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,EAAE,CAAC;QAC1B,MAAM,MAAM,CAAC,iBAAiB,EAAE,CAAC;IACnC,CAAC;IACD,IAAI,CAAC;QACH,OAAO,MAAM,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IACvC,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QAEb,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,GAAG,YAAY,2BAA2B,EAAE,CAAC;YACtE,MAAM,MAAM,CAAC,iBAAiB,EAAE,CAAC;YACjC,OAAO,MAAM,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QACvC,CAAC;QACD,MAAM,GAAG,CAAC;IACZ,CAAC;AACH,CAAC;AAGD,SAAgB,UAAU,CAAC,IAAY;IACrC,OAAO,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;AAC3F,CAAC"}
|
|
@@ -19,16 +19,23 @@ export declare class ChannelGateway {
|
|
|
19
19
|
private reconnecting;
|
|
20
20
|
private closing;
|
|
21
21
|
private pendingWaiters;
|
|
22
|
+
private readonly catalogReads;
|
|
23
|
+
private catalogGeneration;
|
|
24
|
+
private completeGeneration;
|
|
22
25
|
constructor(config: GatewayConfig);
|
|
23
26
|
start(): Promise<void>;
|
|
24
27
|
stop(): Promise<void>;
|
|
25
28
|
private newClient;
|
|
26
29
|
private registerHandlers;
|
|
30
|
+
private recordCatalogReads;
|
|
31
|
+
private isRead;
|
|
32
|
+
private readDownstream;
|
|
27
33
|
private connectDownstream;
|
|
28
34
|
private handleDownstreamClose;
|
|
29
35
|
private waitForConnection;
|
|
30
36
|
private forward;
|
|
31
37
|
private callDownstream;
|
|
38
|
+
private rethrowDownstreamError;
|
|
32
39
|
private emit;
|
|
33
40
|
private notifyLink;
|
|
34
41
|
private sleep;
|
|
@@ -6,6 +6,7 @@ const stdio_js_1 = require("@modelcontextprotocol/sdk/client/stdio.js");
|
|
|
6
6
|
const index_js_2 = require("@modelcontextprotocol/sdk/server/index.js");
|
|
7
7
|
const stdio_js_2 = require("@modelcontextprotocol/sdk/server/stdio.js");
|
|
8
8
|
const types_js_1 = require("@modelcontextprotocol/sdk/types.js");
|
|
9
|
+
const mcp_apps_1 = require("../mcp-apps");
|
|
9
10
|
const interceptor_1 = require("./interceptor");
|
|
10
11
|
const format_1 = require("./format");
|
|
11
12
|
const forwarding_1 = require("./forwarding");
|
|
@@ -20,11 +21,16 @@ class ChannelGateway {
|
|
|
20
21
|
reconnecting = false;
|
|
21
22
|
closing = false;
|
|
22
23
|
pendingWaiters = 0;
|
|
24
|
+
catalogReads = new Map();
|
|
25
|
+
catalogGeneration = 0;
|
|
26
|
+
completeGeneration = 0;
|
|
23
27
|
constructor(config) {
|
|
24
28
|
this.config = config;
|
|
25
29
|
this.server = new index_js_2.Server({ name: config.name ?? 'gitlab-ci-gateway', version: config.version ?? '0.1.0' }, {
|
|
26
30
|
capabilities: {
|
|
27
|
-
tools: {},
|
|
31
|
+
tools: { listChanged: true },
|
|
32
|
+
resources: {},
|
|
33
|
+
extensions: mcp_apps_1.MCP_APPS_EXTENSION,
|
|
28
34
|
experimental: { 'claude/channel': {} },
|
|
29
35
|
},
|
|
30
36
|
instructions: 'Forwards the full gitlab-mcp tool catalog. When a CI pipeline/job is ' +
|
|
@@ -49,22 +55,67 @@ class ChannelGateway {
|
|
|
49
55
|
await this.transport?.close().catch(() => { });
|
|
50
56
|
}
|
|
51
57
|
newClient() {
|
|
52
|
-
|
|
58
|
+
const client = new index_js_1.Client({ name: this.config.name ?? 'gitlab-ci-gateway', version: '0.1.0' });
|
|
59
|
+
client.setNotificationHandler(types_js_1.ToolListChangedNotificationSchema, () => {
|
|
60
|
+
void this.server.sendToolListChanged().catch(() => { });
|
|
61
|
+
});
|
|
62
|
+
return client;
|
|
53
63
|
}
|
|
54
64
|
registerHandlers() {
|
|
55
|
-
this.server.setRequestHandler(types_js_1.ListToolsRequestSchema, async () => {
|
|
56
|
-
const
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
}, 'tools/list', undefined));
|
|
62
|
-
return { tools };
|
|
65
|
+
this.server.setRequestHandler(types_js_1.ListToolsRequestSchema, async (request) => {
|
|
66
|
+
const generation = ++this.catalogGeneration;
|
|
67
|
+
const catalog = (await this.readDownstream('tools/list', (client) => client.listTools(request.params)));
|
|
68
|
+
const complete = !request.params?.cursor && !catalog.nextCursor;
|
|
69
|
+
this.recordCatalogReads(catalog, generation, complete);
|
|
70
|
+
return catalog;
|
|
63
71
|
});
|
|
64
72
|
this.server.setRequestHandler(types_js_1.CallToolRequestSchema, async (request) => {
|
|
65
73
|
const { name, arguments: args } = request.params;
|
|
66
74
|
return (await this.interceptor.handleCall(name, args ?? {}));
|
|
67
75
|
});
|
|
76
|
+
this.server.setRequestHandler(types_js_1.ListResourcesRequestSchema, async (request) => {
|
|
77
|
+
return (await this.readDownstream('resources/list', (client) => client.listResources(request.params)));
|
|
78
|
+
});
|
|
79
|
+
this.server.setRequestHandler(types_js_1.ReadResourceRequestSchema, async (request) => {
|
|
80
|
+
return (await this.readDownstream('resources/read', (client) => client.readResource(request.params)));
|
|
81
|
+
});
|
|
82
|
+
}
|
|
83
|
+
recordCatalogReads(catalog, generation, complete) {
|
|
84
|
+
if (generation < this.completeGeneration)
|
|
85
|
+
return;
|
|
86
|
+
for (const tool of catalog.tools) {
|
|
87
|
+
const known = this.catalogReads.get(tool.name);
|
|
88
|
+
if (known && known.generation > generation)
|
|
89
|
+
continue;
|
|
90
|
+
const read = tool.annotations?.readOnlyHint ?? (0, forwarding_1.isReadCall)(tool.name);
|
|
91
|
+
this.catalogReads.set(tool.name, { read, generation });
|
|
92
|
+
}
|
|
93
|
+
if (!complete)
|
|
94
|
+
return;
|
|
95
|
+
this.completeGeneration = generation;
|
|
96
|
+
for (const [name, known] of this.catalogReads) {
|
|
97
|
+
if (known.generation < generation)
|
|
98
|
+
this.catalogReads.delete(name);
|
|
99
|
+
}
|
|
100
|
+
}
|
|
101
|
+
isRead(name) {
|
|
102
|
+
return this.catalogReads.get(name)?.read ?? (0, forwarding_1.isReadCall)(name);
|
|
103
|
+
}
|
|
104
|
+
readDownstream(name, read) {
|
|
105
|
+
return (0, forwarding_1.forwardWithPolicy)({
|
|
106
|
+
isRead: () => true,
|
|
107
|
+
isConnected: () => this.connected,
|
|
108
|
+
waitForConnection: () => this.waitForConnection(),
|
|
109
|
+
call: async () => {
|
|
110
|
+
const client = this.client;
|
|
111
|
+
try {
|
|
112
|
+
return await read(client);
|
|
113
|
+
}
|
|
114
|
+
catch (error) {
|
|
115
|
+
this.rethrowDownstreamError(client, error);
|
|
116
|
+
}
|
|
117
|
+
},
|
|
118
|
+
}, name, undefined);
|
|
68
119
|
}
|
|
69
120
|
async connectDownstream() {
|
|
70
121
|
const maxBackoff = this.config.maxBackoffMs ?? 30_000;
|
|
@@ -86,8 +137,10 @@ class ChannelGateway {
|
|
|
86
137
|
return;
|
|
87
138
|
}
|
|
88
139
|
this.connected = true;
|
|
89
|
-
if (this.reconnecting)
|
|
140
|
+
if (this.reconnecting) {
|
|
90
141
|
this.notifyLink('restored');
|
|
142
|
+
void this.server.sendToolListChanged().catch(() => { });
|
|
143
|
+
}
|
|
91
144
|
return;
|
|
92
145
|
}
|
|
93
146
|
catch {
|
|
@@ -131,17 +184,28 @@ class ChannelGateway {
|
|
|
131
184
|
}
|
|
132
185
|
forward(name, args) {
|
|
133
186
|
return (0, forwarding_1.forwardWithPolicy)({
|
|
134
|
-
isRead:
|
|
187
|
+
isRead: (name) => this.isRead(name),
|
|
135
188
|
isConnected: () => this.connected,
|
|
136
189
|
waitForConnection: () => this.waitForConnection(),
|
|
137
190
|
call: (n, a) => this.callDownstream(n, a),
|
|
138
191
|
}, name, args);
|
|
139
192
|
}
|
|
140
193
|
async callDownstream(name, args) {
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
arguments: (args ?? {})
|
|
144
|
-
}
|
|
194
|
+
const client = this.client;
|
|
195
|
+
try {
|
|
196
|
+
return await client.callTool({ name, arguments: (args ?? {}) });
|
|
197
|
+
}
|
|
198
|
+
catch (error) {
|
|
199
|
+
this.rethrowDownstreamError(client, error);
|
|
200
|
+
}
|
|
201
|
+
}
|
|
202
|
+
rethrowDownstreamError(client, error) {
|
|
203
|
+
if (!client.transport &&
|
|
204
|
+
error instanceof types_js_1.McpError &&
|
|
205
|
+
error.code === types_js_1.ErrorCode.ConnectionClosed) {
|
|
206
|
+
throw new forwarding_1.DownstreamDisconnectedError(error);
|
|
207
|
+
}
|
|
208
|
+
throw error;
|
|
145
209
|
}
|
|
146
210
|
emit(event) {
|
|
147
211
|
const { content, meta } = (0, format_1.formatEvent)(event);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gateway.js","sourceRoot":"","sources":["../../../src/channel-gateway/gateway.ts"],"names":[],"mappings":";;;AAYA,wEAAmE;AACnE,wEAAiF;AACjF,wEAAmE;AACnE,wEAAiF;AACjF,
|
|
1
|
+
{"version":3,"file":"gateway.js","sourceRoot":"","sources":["../../../src/channel-gateway/gateway.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { ContainerRuntimeInfo } from './types';
|
|
2
|
+
export declare function completionDependencyError(info: ContainerRuntimeInfo): string | undefined;
|
|
2
3
|
export declare function detectContainerRuntime(): ContainerRuntimeInfo;
|
|
3
4
|
export declare function getContainerRuntime(): ContainerRuntimeInfo;
|
|
4
5
|
export declare function resetRuntimeCache(): void;
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.completionDependencyError = completionDependencyError;
|
|
3
4
|
exports.detectContainerRuntime = detectContainerRuntime;
|
|
4
5
|
exports.getContainerRuntime = getContainerRuntime;
|
|
5
6
|
exports.resetRuntimeCache = resetRuntimeCache;
|
|
@@ -36,33 +37,64 @@ function parseVersion(output) {
|
|
|
36
37
|
const match = output.match(/(\d+\.\d+\.\d+)/);
|
|
37
38
|
return match?.[1];
|
|
38
39
|
}
|
|
40
|
+
function describeCompose(cmd, output) {
|
|
41
|
+
if (!output)
|
|
42
|
+
return { cmd };
|
|
43
|
+
return {
|
|
44
|
+
cmd,
|
|
45
|
+
provider: /podman-compose/i.test(output) ? 'podman-compose' : 'docker-compose',
|
|
46
|
+
version: parseVersion(output),
|
|
47
|
+
};
|
|
48
|
+
}
|
|
39
49
|
function detectComposeCmd(runtime) {
|
|
40
50
|
const runtimeCmd = runtime;
|
|
41
51
|
if (commandSucceeds(runtimeCmd, ['compose', 'version'])) {
|
|
42
|
-
|
|
52
|
+
const cmd = [runtimeCmd, 'compose'];
|
|
53
|
+
return describeCompose(cmd, commandOutput(runtimeCmd, ['compose', 'version']));
|
|
43
54
|
}
|
|
44
55
|
const standaloneCompose = `${runtimeCmd}-compose`;
|
|
45
56
|
if (commandSucceeds(standaloneCompose, ['--version'])) {
|
|
46
|
-
return [standaloneCompose];
|
|
57
|
+
return describeCompose([standaloneCompose], commandOutput(standaloneCompose, ['--version']));
|
|
47
58
|
}
|
|
48
59
|
if (commandSucceeds('docker-compose', ['--version'])) {
|
|
49
|
-
return ['docker-compose'];
|
|
60
|
+
return describeCompose(['docker-compose'], commandOutput('docker-compose', ['--version']));
|
|
50
61
|
}
|
|
51
62
|
return null;
|
|
52
63
|
}
|
|
64
|
+
function versionAtLeast(actual, minimum) {
|
|
65
|
+
const a = actual.split('.').map(Number);
|
|
66
|
+
const m = minimum.split('.').map(Number);
|
|
67
|
+
for (let i = 0; i < m.length; i++) {
|
|
68
|
+
if (a[i] !== m[i])
|
|
69
|
+
return a[i] > m[i];
|
|
70
|
+
}
|
|
71
|
+
return true;
|
|
72
|
+
}
|
|
73
|
+
function completionDependencyError(info) {
|
|
74
|
+
const required = 'Docker Compose v2 or podman-compose 1.6.0 or later';
|
|
75
|
+
if (!info.composeCmd || !info.composeVersion) {
|
|
76
|
+
return `Could not determine the compose version; PostgreSQL deployments need ${required}.`;
|
|
77
|
+
}
|
|
78
|
+
const minimum = info.composeProvider === 'podman-compose' ? '1.6.0' : '2.0.0';
|
|
79
|
+
if (versionAtLeast(info.composeVersion, minimum))
|
|
80
|
+
return undefined;
|
|
81
|
+
return `${info.composeProvider} ${info.composeVersion} cannot order the database migration before the server; install ${required}.`;
|
|
82
|
+
}
|
|
53
83
|
function detectContainerRuntime() {
|
|
54
84
|
const runtimes = ['docker', 'podman'];
|
|
55
85
|
for (const runtime of runtimes) {
|
|
56
86
|
const versionOutput = commandOutput(runtime, ['--version']);
|
|
57
87
|
if (versionOutput) {
|
|
58
88
|
const runtimeAvailable = commandSucceeds(runtime, ['info']);
|
|
59
|
-
const
|
|
89
|
+
const compose = detectComposeCmd(runtime);
|
|
60
90
|
const runtimeVersion = parseVersion(versionOutput);
|
|
61
91
|
return {
|
|
62
92
|
runtime,
|
|
63
93
|
runtimeCmd: runtime,
|
|
64
94
|
runtimeAvailable,
|
|
65
|
-
composeCmd,
|
|
95
|
+
composeCmd: compose?.cmd ?? null,
|
|
96
|
+
...(compose?.provider && { composeProvider: compose.provider }),
|
|
97
|
+
...(compose?.version && { composeVersion: compose.version }),
|
|
66
98
|
runtimeVersion,
|
|
67
99
|
};
|
|
68
100
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"container-runtime.js","sourceRoot":"","sources":["../../../../src/cli/docker/container-runtime.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"container-runtime.js","sourceRoot":"","sources":["../../../../src/cli/docker/container-runtime.ts"],"names":[],"mappings":"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"}
|
|
@@ -48,6 +48,7 @@ const p = __importStar(require("@clack/prompts"));
|
|
|
48
48
|
const crypto_1 = require("crypto");
|
|
49
49
|
const docker_utils_1 = require("./docker-utils");
|
|
50
50
|
const types_1 = require("./types");
|
|
51
|
+
const oauth_issuer_prompt_1 = require("./oauth-issuer-prompt");
|
|
51
52
|
function parseDockerSubcommand(args) {
|
|
52
53
|
const subcommand = args[0];
|
|
53
54
|
const subArgs = args.slice(1);
|
|
@@ -152,17 +153,25 @@ async function initDocker() {
|
|
|
152
153
|
return;
|
|
153
154
|
}
|
|
154
155
|
let oauthSessionSecret;
|
|
156
|
+
let oauthIssuer;
|
|
155
157
|
if (enableOAuth) {
|
|
156
158
|
p.note('OAuth mode allows users to authenticate with multiple GitLab instances.\n' +
|
|
157
159
|
"You'll need to register OAuth applications on each GitLab instance.", 'OAuth Mode');
|
|
160
|
+
const issuer = await (0, oauth_issuer_prompt_1.promptOAuthIssuer)(Number.parseInt(port, 10));
|
|
161
|
+
if (p.isCancel(issuer)) {
|
|
162
|
+
p.cancel('Setup cancelled');
|
|
163
|
+
return;
|
|
164
|
+
}
|
|
165
|
+
oauthIssuer = issuer;
|
|
158
166
|
oauthSessionSecret = (0, crypto_1.randomBytes)(32).toString('hex');
|
|
159
|
-
p.log.warn('Session secret will be stored in docker-compose.yml. Keep this file secure and do NOT commit to version control.');
|
|
167
|
+
p.log.warn('Session secret will be stored in the .env file next to docker-compose.yml. Keep this file secure and do NOT commit to version control.');
|
|
160
168
|
}
|
|
161
169
|
const config = {
|
|
162
170
|
...types_1.DEFAULT_DOCKER_CONFIG,
|
|
163
171
|
port: parseInt(port, 10),
|
|
164
172
|
oauthEnabled: enableOAuth,
|
|
165
173
|
oauthSessionSecret,
|
|
174
|
+
oauthIssuer,
|
|
166
175
|
};
|
|
167
176
|
const spinner = p.spinner();
|
|
168
177
|
spinner.start('Creating Docker configuration...');
|
|
@@ -327,7 +336,7 @@ async function dockerAddInstance(host) {
|
|
|
327
336
|
}
|
|
328
337
|
const envName = instanceHost.toUpperCase().replace(/[^A-Z0-9]/g, '_') + '_SECRET';
|
|
329
338
|
p.note(`Store your OAuth secret in environment variable: ${envName}\n` +
|
|
330
|
-
`Add to
|
|
339
|
+
`Add ${envName}=<secret> to the .env file next to docker-compose.yml.`, 'OAuth Secret');
|
|
331
340
|
oauth = {
|
|
332
341
|
clientId,
|
|
333
342
|
clientSecretEnv: envName,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"docker-command.js","sourceRoot":"","sources":["../../../../src/cli/docker/docker-command.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"docker-command.js","sourceRoot":"","sources":["../../../../src/cli/docker/docker-command.ts"],"names":[],"mappings":"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"}
|
|
@@ -23,3 +23,4 @@ export declare function addInstance(instance: GitLabInstance): void;
|
|
|
23
23
|
export declare function removeInstance(host: string): boolean;
|
|
24
24
|
export declare function initDockerConfig(config?: Partial<DockerConfig>): DockerConfig;
|
|
25
25
|
export declare function saveEnvFile(config: DockerConfig): void;
|
|
26
|
+
export declare function mergeEnvFile(existing: string, managed: ReadonlyMap<string, string>): string;
|