@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
|
@@ -39,6 +39,17 @@ const types_1 = require("./types");
|
|
|
39
39
|
const connection_1 = require("./connection");
|
|
40
40
|
const config_generator_1 = require("./config-generator");
|
|
41
41
|
const browser_1 = require("./browser");
|
|
42
|
+
const codex_1 = require("../install/codex");
|
|
43
|
+
function reportCodexInstall(result) {
|
|
44
|
+
if (result.success) {
|
|
45
|
+
p.log.success('MCP server installed!');
|
|
46
|
+
}
|
|
47
|
+
else {
|
|
48
|
+
p.log.error(result.error ?? 'Installation failed');
|
|
49
|
+
}
|
|
50
|
+
for (const note of result.notes ?? [])
|
|
51
|
+
p.log.warn(note);
|
|
52
|
+
}
|
|
42
53
|
function maskSensitiveContent(content) {
|
|
43
54
|
let masked = content;
|
|
44
55
|
masked = masked.replace(/("GITLAB_TOKEN"\s*:\s*")((?:\\.|[^"\\])*)(")/g, '$1****$3');
|
|
@@ -207,7 +218,26 @@ async function runWizard() {
|
|
|
207
218
|
process.exit(0);
|
|
208
219
|
return;
|
|
209
220
|
}
|
|
210
|
-
if (runNow) {
|
|
221
|
+
if (runNow && client === 'codex') {
|
|
222
|
+
const serverConfig = (0, config_generator_1.generateServerConfig)(wizardConfig);
|
|
223
|
+
const result = (0, codex_1.installCodex)(serverConfig, false);
|
|
224
|
+
if (!result.wasAlreadyConfigured) {
|
|
225
|
+
reportCodexInstall(result);
|
|
226
|
+
}
|
|
227
|
+
else {
|
|
228
|
+
const replace = await p.confirm({
|
|
229
|
+
message: `Codex already has a ${codex_1.CODEX_SERVER_NAME} entry. Replace it?`,
|
|
230
|
+
initialValue: false,
|
|
231
|
+
});
|
|
232
|
+
if (p.isCancel(replace) || !replace) {
|
|
233
|
+
p.log.info(`Kept the existing Codex ${codex_1.CODEX_SERVER_NAME} entry.`);
|
|
234
|
+
}
|
|
235
|
+
else {
|
|
236
|
+
reportCodexInstall((0, codex_1.installCodex)(serverConfig, true));
|
|
237
|
+
}
|
|
238
|
+
}
|
|
239
|
+
}
|
|
240
|
+
else if (runNow) {
|
|
211
241
|
const { spawnSync } = await Promise.resolve().then(() => __importStar(require('child_process')));
|
|
212
242
|
const serverConfig = (0, config_generator_1.generateServerConfig)(wizardConfig);
|
|
213
243
|
const args = [
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wizard.js","sourceRoot":"","sources":["../../../../src/cli/init/wizard.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"wizard.js","sourceRoot":"","sources":["../../../../src/cli/init/wizard.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
import { InstallResult } from './types';
|
|
2
|
+
import { McpServerConfig } from '../init/types';
|
|
3
|
+
export declare const CODEX_SERVER_NAME = "gitlab-sw";
|
|
4
|
+
export type CodexTransport = {
|
|
5
|
+
type: 'stdio';
|
|
6
|
+
command: string;
|
|
7
|
+
args?: string[] | null;
|
|
8
|
+
env?: Record<string, string> | null;
|
|
9
|
+
} | {
|
|
10
|
+
type: 'streamable_http';
|
|
11
|
+
url: string;
|
|
12
|
+
};
|
|
13
|
+
export interface CodexServer {
|
|
14
|
+
name: string;
|
|
15
|
+
transport: CodexTransport;
|
|
16
|
+
enabled?: boolean;
|
|
17
|
+
disabled_reason?: string | null;
|
|
18
|
+
}
|
|
19
|
+
export declare function codexConfigPath(): string;
|
|
20
|
+
export declare function listCodexServers(): CodexServer[];
|
|
21
|
+
export declare function isGitlabMcpServer(server: CodexServer, target?: McpServerConfig): boolean;
|
|
22
|
+
export declare function hasGlobalEntry(configPath: string): boolean;
|
|
23
|
+
export declare function installCodex(config: McpServerConfig, force: boolean): InstallResult;
|
|
24
|
+
export declare function tomlString(value: string): string;
|
|
25
|
+
export declare function codexConfigPreview(config: McpServerConfig): string;
|
|
@@ -0,0 +1,261 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.CODEX_SERVER_NAME = void 0;
|
|
4
|
+
exports.codexConfigPath = codexConfigPath;
|
|
5
|
+
exports.listCodexServers = listCodexServers;
|
|
6
|
+
exports.isGitlabMcpServer = isGitlabMcpServer;
|
|
7
|
+
exports.hasGlobalEntry = hasGlobalEntry;
|
|
8
|
+
exports.installCodex = installCodex;
|
|
9
|
+
exports.tomlString = tomlString;
|
|
10
|
+
exports.codexConfigPreview = codexConfigPreview;
|
|
11
|
+
const node_fs_1 = require("node:fs");
|
|
12
|
+
const node_os_1 = require("node:os");
|
|
13
|
+
const node_path_1 = require("node:path");
|
|
14
|
+
const cross_spawn_1 = require("cross-spawn");
|
|
15
|
+
const smol_toml_1 = require("smol-toml");
|
|
16
|
+
const types_1 = require("../init/types");
|
|
17
|
+
const backup_1 = require("./backup");
|
|
18
|
+
const listing_1 = require("../plugin/listing");
|
|
19
|
+
exports.CODEX_SERVER_NAME = listing_1.MCP_SERVER_NAME;
|
|
20
|
+
const CODEX_COMMAND = 'codex';
|
|
21
|
+
const PACKAGE_PATTERN = /@structured-world\/gitlab-mcp(?:@[^\s/]*)?$/;
|
|
22
|
+
const CHECKOUT_PATTERN = /gitlab-mcp[\\/](?:packages[\\/]gitlab-mcp[\\/])?dist[\\/]src[\\/]main\.js$/;
|
|
23
|
+
const GLOBAL_BIN_PATTERN = /(?:^|[\\/])gitlab-mcp(?:\.cmd|\.ps1|\.exe)?$/i;
|
|
24
|
+
const CODEX_TIMEOUT_MS = 60_000;
|
|
25
|
+
function runCodex(args, interactive = false) {
|
|
26
|
+
const result = (0, cross_spawn_1.sync)(CODEX_COMMAND, args, {
|
|
27
|
+
stdio: interactive ? 'inherit' : 'pipe',
|
|
28
|
+
encoding: 'utf8',
|
|
29
|
+
...(interactive ? {} : { timeout: CODEX_TIMEOUT_MS }),
|
|
30
|
+
});
|
|
31
|
+
return {
|
|
32
|
+
status: result.status,
|
|
33
|
+
stdout: typeof result.stdout === 'string' ? result.stdout : '',
|
|
34
|
+
stderr: typeof result.stderr === 'string' ? result.stderr : '',
|
|
35
|
+
error: result.error,
|
|
36
|
+
};
|
|
37
|
+
}
|
|
38
|
+
function failure(result) {
|
|
39
|
+
return (result.error?.message ??
|
|
40
|
+
(result.stderr.trim() || result.stdout.trim() || `codex exited with ${result.status}`));
|
|
41
|
+
}
|
|
42
|
+
function codexConfigPath() {
|
|
43
|
+
return (0, node_path_1.join)(process.env.CODEX_HOME ?? (0, node_path_1.join)((0, node_os_1.homedir)(), '.codex'), 'config.toml');
|
|
44
|
+
}
|
|
45
|
+
function listCodexServers() {
|
|
46
|
+
const result = runCodex(['mcp', 'list', '--json']);
|
|
47
|
+
if (result.status !== 0)
|
|
48
|
+
throw new Error(`codex mcp list failed: ${failure(result)}`);
|
|
49
|
+
const parsed = JSON.parse(result.stdout);
|
|
50
|
+
if (!Array.isArray(parsed))
|
|
51
|
+
throw new Error('codex mcp list returned an unexpected format');
|
|
52
|
+
return parsed;
|
|
53
|
+
}
|
|
54
|
+
function getCodexServer(name) {
|
|
55
|
+
const result = runCodex(['mcp', 'get', name, '--json']);
|
|
56
|
+
if (result.status !== 0)
|
|
57
|
+
return undefined;
|
|
58
|
+
try {
|
|
59
|
+
return JSON.parse(result.stdout);
|
|
60
|
+
}
|
|
61
|
+
catch {
|
|
62
|
+
return undefined;
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
function isGitlabMcpServer(server, target) {
|
|
66
|
+
if (server.name === exports.CODEX_SERVER_NAME || server.name.startsWith('gitlab-mcp'))
|
|
67
|
+
return true;
|
|
68
|
+
const transport = server.transport;
|
|
69
|
+
if (transport.type === 'stdio') {
|
|
70
|
+
return (GLOBAL_BIN_PATTERN.test(transport.command) ||
|
|
71
|
+
[transport.command, ...(transport.args ?? [])].some((part) => PACKAGE_PATTERN.test(part) || CHECKOUT_PATTERN.test(part)));
|
|
72
|
+
}
|
|
73
|
+
return target !== undefined && (0, types_1.isRemoteServerConfig)(target) && transport.url === target.url;
|
|
74
|
+
}
|
|
75
|
+
function matches(server, config) {
|
|
76
|
+
const transport = server.transport;
|
|
77
|
+
if ((0, types_1.isRemoteServerConfig)(config)) {
|
|
78
|
+
return transport.type === 'streamable_http' && transport.url === config.url;
|
|
79
|
+
}
|
|
80
|
+
if (transport.type !== 'stdio')
|
|
81
|
+
return false;
|
|
82
|
+
const saved = transport.env ?? {};
|
|
83
|
+
const wanted = Object.entries(config.env);
|
|
84
|
+
return (transport.command === config.command &&
|
|
85
|
+
JSON.stringify(transport.args ?? []) === JSON.stringify(config.args) &&
|
|
86
|
+
Object.keys(saved).length === wanted.length &&
|
|
87
|
+
wanted.every(([key, value]) => saved[key] === value));
|
|
88
|
+
}
|
|
89
|
+
function addArgs(config) {
|
|
90
|
+
if ((0, types_1.isRemoteServerConfig)(config))
|
|
91
|
+
return ['mcp', 'add', exports.CODEX_SERVER_NAME, '--url', config.url];
|
|
92
|
+
const env = Object.entries(config.env).flatMap(([key, value]) => ['--env', `${key}=${value}`]);
|
|
93
|
+
return ['mcp', 'add', exports.CODEX_SERVER_NAME, ...env, '--', config.command, ...config.args];
|
|
94
|
+
}
|
|
95
|
+
function duplicateNotes(servers, config) {
|
|
96
|
+
return servers
|
|
97
|
+
.filter((s) => s.name !== exports.CODEX_SERVER_NAME && isGitlabMcpServer(s, config))
|
|
98
|
+
.map((s) => `"${s.name}" also runs GitLab MCP, so Codex lists its tools twice; ` +
|
|
99
|
+
`remove the one you do not use (codex mcp remove ${s.name}, or disable the plugin).`);
|
|
100
|
+
}
|
|
101
|
+
function removeExisting(configPath, backup) {
|
|
102
|
+
if (backup && !backup.created) {
|
|
103
|
+
return `Could not back up ${configPath}: ${backup.error ?? 'unknown error'}`;
|
|
104
|
+
}
|
|
105
|
+
const removed = runCodex(['mcp', 'remove', exports.CODEX_SERVER_NAME]);
|
|
106
|
+
if (removed.status !== 0) {
|
|
107
|
+
return `Failed to remove the existing ${exports.CODEX_SERVER_NAME} entry: ${failure(removed)}`;
|
|
108
|
+
}
|
|
109
|
+
return undefined;
|
|
110
|
+
}
|
|
111
|
+
function hasGlobalEntry(configPath) {
|
|
112
|
+
if (!(0, node_fs_1.existsSync)(configPath))
|
|
113
|
+
return false;
|
|
114
|
+
const servers = (0, smol_toml_1.parse)((0, node_fs_1.readFileSync)(configPath, 'utf8')).mcp_servers;
|
|
115
|
+
return (typeof servers === 'object' && servers !== null && Object.hasOwn(servers, exports.CODEX_SERVER_NAME));
|
|
116
|
+
}
|
|
117
|
+
function installedPlugins() {
|
|
118
|
+
const result = runCodex(['plugin', 'list', '--json']);
|
|
119
|
+
if (result.status !== 0)
|
|
120
|
+
return [];
|
|
121
|
+
try {
|
|
122
|
+
const { installed } = JSON.parse(result.stdout);
|
|
123
|
+
return (installed ?? []).filter((plugin) => plugin.name === listing_1.PLUGIN_NAME);
|
|
124
|
+
}
|
|
125
|
+
catch {
|
|
126
|
+
return [];
|
|
127
|
+
}
|
|
128
|
+
}
|
|
129
|
+
function shadowNotes(plugins) {
|
|
130
|
+
const entry = exports.CODEX_SERVER_NAME;
|
|
131
|
+
return plugins.map(({ pluginId: id, enabled }) => enabled
|
|
132
|
+
? `The ${id} plugin is installed and its "${entry}" server stays unused while this ` +
|
|
133
|
+
`entry exists; keep one (codex plugin remove ${id}, or codex mcp remove ${entry}).`
|
|
134
|
+
:
|
|
135
|
+
`The ${id} plugin is installed but disabled; while this entry exists its "${entry}" ` +
|
|
136
|
+
`server stays unused even when enabled. To use the plugin, enable it, then run ` +
|
|
137
|
+
`codex mcp remove ${entry}; or remove it with codex plugin remove ${id}.`);
|
|
138
|
+
}
|
|
139
|
+
function rollBack(hadEntry, backupPath, configPath) {
|
|
140
|
+
if (backupPath !== undefined) {
|
|
141
|
+
return (0, backup_1.restoreBackup)(backupPath, configPath)
|
|
142
|
+
? '; the previous Codex configuration was restored'
|
|
143
|
+
: `; restoring the previous Codex configuration failed, restore it by hand from ${backupPath}`;
|
|
144
|
+
}
|
|
145
|
+
if (hadEntry || !hasGlobalEntry(configPath))
|
|
146
|
+
return '';
|
|
147
|
+
runCodex(['mcp', 'remove', exports.CODEX_SERVER_NAME]);
|
|
148
|
+
return hasGlobalEntry(configPath)
|
|
149
|
+
? `; the partly saved ${exports.CODEX_SERVER_NAME} entry is still in config.toml, remove it with: codex mcp remove ${exports.CODEX_SERVER_NAME}`
|
|
150
|
+
: `; the partly saved ${exports.CODEX_SERVER_NAME} entry was removed`;
|
|
151
|
+
}
|
|
152
|
+
function installCodex(config, force) {
|
|
153
|
+
const client = 'codex';
|
|
154
|
+
const configPath = codexConfigPath();
|
|
155
|
+
let servers;
|
|
156
|
+
try {
|
|
157
|
+
servers = listCodexServers();
|
|
158
|
+
}
|
|
159
|
+
catch (error) {
|
|
160
|
+
return { client, success: false, error: error.message };
|
|
161
|
+
}
|
|
162
|
+
const notes = duplicateNotes(servers, config);
|
|
163
|
+
let existing;
|
|
164
|
+
try {
|
|
165
|
+
existing = hasGlobalEntry(configPath);
|
|
166
|
+
}
|
|
167
|
+
catch (error) {
|
|
168
|
+
const reason = error.message;
|
|
169
|
+
return { client, success: false, error: `Cannot read ${configPath}: ${reason}`, notes };
|
|
170
|
+
}
|
|
171
|
+
if (!existing && servers.some((s) => s.name === exports.CODEX_SERVER_NAME)) {
|
|
172
|
+
return {
|
|
173
|
+
client,
|
|
174
|
+
success: false,
|
|
175
|
+
error: `Codex already runs a server named "${exports.CODEX_SERVER_NAME}" from a plugin or project ` +
|
|
176
|
+
'configuration; disable it there before installing.',
|
|
177
|
+
configPath,
|
|
178
|
+
notes,
|
|
179
|
+
};
|
|
180
|
+
}
|
|
181
|
+
if (existing && !force) {
|
|
182
|
+
return {
|
|
183
|
+
client,
|
|
184
|
+
success: false,
|
|
185
|
+
error: 'gitlab-mcp is already configured. Use --force to overwrite.',
|
|
186
|
+
wasAlreadyConfigured: true,
|
|
187
|
+
configPath,
|
|
188
|
+
notes: [...notes, ...shadowNotes(installedPlugins())],
|
|
189
|
+
};
|
|
190
|
+
}
|
|
191
|
+
const backup = (0, node_fs_1.existsSync)(configPath) ? (0, backup_1.createBackup)({ configPath }) : undefined;
|
|
192
|
+
const backupPath = backup?.created ? backup.backupPath : undefined;
|
|
193
|
+
if (existing) {
|
|
194
|
+
const error = removeExisting(configPath, backup);
|
|
195
|
+
if (error)
|
|
196
|
+
return { client, success: false, error, backupPath, configPath, notes };
|
|
197
|
+
}
|
|
198
|
+
const added = runCodex(addArgs(config), (0, types_1.isRemoteServerConfig)(config));
|
|
199
|
+
const applied = getCodexServer(exports.CODEX_SERVER_NAME);
|
|
200
|
+
if (!applied || !matches(applied, config)) {
|
|
201
|
+
const error = `codex mcp add failed: ${failure(added)}${rollBack(existing, backupPath, configPath)}`;
|
|
202
|
+
return { client, success: false, error, backupPath, configPath, notes };
|
|
203
|
+
}
|
|
204
|
+
if (applied.enabled === false) {
|
|
205
|
+
const reason = applied.disabled_reason ?? 'no reason given';
|
|
206
|
+
const restored = existing ? rollBack(existing, backupPath, configPath) : '';
|
|
207
|
+
const error = `Codex saved the ${exports.CODEX_SERVER_NAME} entry but keeps it disabled: ${reason}${restored}`;
|
|
208
|
+
return { client, success: false, error, backupPath, configPath, notes };
|
|
209
|
+
}
|
|
210
|
+
if (added.status !== 0 && (0, types_1.isRemoteServerConfig)(config)) {
|
|
211
|
+
notes.push(`Sign-in did not complete; run: codex mcp login ${exports.CODEX_SERVER_NAME}`);
|
|
212
|
+
}
|
|
213
|
+
notes.push(...shadowNotes(installedPlugins()));
|
|
214
|
+
return {
|
|
215
|
+
client,
|
|
216
|
+
success: true,
|
|
217
|
+
backupPath,
|
|
218
|
+
configPath,
|
|
219
|
+
wasAlreadyConfigured: existing,
|
|
220
|
+
notes,
|
|
221
|
+
};
|
|
222
|
+
}
|
|
223
|
+
const TOML_SHORT_ESCAPES = {
|
|
224
|
+
'\\': String.raw `\\`,
|
|
225
|
+
'"': String.raw `\"`,
|
|
226
|
+
'\n': String.raw `\n`,
|
|
227
|
+
'\t': String.raw `\t`,
|
|
228
|
+
'\r': String.raw `\r`,
|
|
229
|
+
};
|
|
230
|
+
function tomlString(value) {
|
|
231
|
+
let escaped = '';
|
|
232
|
+
for (const char of value) {
|
|
233
|
+
const code = char.codePointAt(0);
|
|
234
|
+
const short = TOML_SHORT_ESCAPES[char];
|
|
235
|
+
if (short !== undefined)
|
|
236
|
+
escaped += short;
|
|
237
|
+
else if (code < 0x20 || code === 0x7f) {
|
|
238
|
+
escaped += String.raw `\u` + code.toString(16).padStart(4, '0');
|
|
239
|
+
}
|
|
240
|
+
else
|
|
241
|
+
escaped += char;
|
|
242
|
+
}
|
|
243
|
+
return `"${escaped}"`;
|
|
244
|
+
}
|
|
245
|
+
function codexConfigPreview(config) {
|
|
246
|
+
const lines = [`[mcp_servers.${exports.CODEX_SERVER_NAME}]`];
|
|
247
|
+
if ((0, types_1.isRemoteServerConfig)(config)) {
|
|
248
|
+
lines.push(`url = ${tomlString(config.url)}`);
|
|
249
|
+
return lines.join('\n');
|
|
250
|
+
}
|
|
251
|
+
lines.push(`command = ${tomlString(config.command)}`, `args = [${config.args.map(tomlString).join(', ')}]`);
|
|
252
|
+
const env = Object.entries(config.env);
|
|
253
|
+
if (env.length > 0) {
|
|
254
|
+
lines.push('', `[mcp_servers.${exports.CODEX_SERVER_NAME}.env]`);
|
|
255
|
+
for (const [key, value] of env) {
|
|
256
|
+
lines.push(`${/^[A-Za-z0-9_-]+$/.test(key) ? key : tomlString(key)} = ${tomlString(value)}`);
|
|
257
|
+
}
|
|
258
|
+
}
|
|
259
|
+
return lines.join('\n');
|
|
260
|
+
}
|
|
261
|
+
//# sourceMappingURL=codex.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"codex.js","sourceRoot":"","sources":["../../../../src/cli/install/codex.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,6 +13,7 @@ const fs_1 = require("fs");
|
|
|
13
13
|
const child_process_1 = require("child_process");
|
|
14
14
|
const types_1 = require("./types");
|
|
15
15
|
const path_utils_js_1 = require("../utils/path-utils.js");
|
|
16
|
+
const codex_1 = require("./codex");
|
|
16
17
|
var path_utils_js_2 = require("../utils/path-utils.js");
|
|
17
18
|
Object.defineProperty(exports, "expandPath", { enumerable: true, get: function () { return path_utils_js_2.expandPath; } });
|
|
18
19
|
function getConfigPath(client) {
|
|
@@ -75,7 +76,28 @@ function isAlreadyConfigured(configPath) {
|
|
|
75
76
|
return false;
|
|
76
77
|
}
|
|
77
78
|
}
|
|
79
|
+
function detectCodex() {
|
|
80
|
+
const configPath = (0, codex_1.codexConfigPath)();
|
|
81
|
+
const result = {
|
|
82
|
+
client: 'codex',
|
|
83
|
+
detected: commandExists('codex'),
|
|
84
|
+
method: 'cli-command',
|
|
85
|
+
configPath,
|
|
86
|
+
configExists: (0, fs_1.existsSync)(configPath),
|
|
87
|
+
};
|
|
88
|
+
if (result.detected) {
|
|
89
|
+
try {
|
|
90
|
+
result.alreadyConfigured = (0, codex_1.hasGlobalEntry)(configPath);
|
|
91
|
+
}
|
|
92
|
+
catch {
|
|
93
|
+
result.alreadyConfigured = false;
|
|
94
|
+
}
|
|
95
|
+
}
|
|
96
|
+
return result;
|
|
97
|
+
}
|
|
78
98
|
function detectClient(client) {
|
|
99
|
+
if (client === 'codex')
|
|
100
|
+
return detectCodex();
|
|
79
101
|
const metadata = types_1.CLIENT_METADATA[client];
|
|
80
102
|
const configPath = getConfigPath(client);
|
|
81
103
|
const expandedPath = configPath ? (0, path_utils_js_1.expandPath)(configPath) : undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"detector.js","sourceRoot":"","sources":["../../../../src/cli/install/detector.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"detector.js","sourceRoot":"","sources":["../../../../src/cli/install/detector.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,4 +2,5 @@ export * from './types';
|
|
|
2
2
|
export * from './detector';
|
|
3
3
|
export * from './backup';
|
|
4
4
|
export * from './installers';
|
|
5
|
-
export
|
|
5
|
+
export * from './codex';
|
|
6
|
+
export { runInstallWizard, runInstallCommand, parseInstallFlags, buildServerConfig, buildServerConfigFromEnv, } from './install-command';
|
|
@@ -14,14 +14,16 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
14
14
|
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
15
|
};
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
-
exports.buildServerConfigFromEnv = exports.parseInstallFlags = exports.runInstallCommand = exports.runInstallWizard = void 0;
|
|
17
|
+
exports.buildServerConfigFromEnv = exports.buildServerConfig = exports.parseInstallFlags = exports.runInstallCommand = exports.runInstallWizard = void 0;
|
|
18
18
|
__exportStar(require("./types"), exports);
|
|
19
19
|
__exportStar(require("./detector"), exports);
|
|
20
20
|
__exportStar(require("./backup"), exports);
|
|
21
21
|
__exportStar(require("./installers"), exports);
|
|
22
|
+
__exportStar(require("./codex"), exports);
|
|
22
23
|
var install_command_1 = require("./install-command");
|
|
23
24
|
Object.defineProperty(exports, "runInstallWizard", { enumerable: true, get: function () { return install_command_1.runInstallWizard; } });
|
|
24
25
|
Object.defineProperty(exports, "runInstallCommand", { enumerable: true, get: function () { return install_command_1.runInstallCommand; } });
|
|
25
26
|
Object.defineProperty(exports, "parseInstallFlags", { enumerable: true, get: function () { return install_command_1.parseInstallFlags; } });
|
|
27
|
+
Object.defineProperty(exports, "buildServerConfig", { enumerable: true, get: function () { return install_command_1.buildServerConfig; } });
|
|
26
28
|
Object.defineProperty(exports, "buildServerConfigFromEnv", { enumerable: true, get: function () { return install_command_1.buildServerConfigFromEnv; } });
|
|
27
29
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/cli/install/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAIA,0CAAwB;AACxB,6CAA2B;AAC3B,2CAAyB;AACzB,+CAA6B;AAC7B,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/cli/install/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAIA,0CAAwB;AACxB,6CAA2B;AAC3B,2CAAyB;AACzB,+CAA6B;AAC7B,0CAAwB;AACxB,qDAM2B;AALzB,mHAAA,gBAAgB,OAAA;AAChB,oHAAA,iBAAiB,OAAA;AACjB,oHAAA,iBAAiB,OAAA;AACjB,oHAAA,iBAAiB,OAAA;AACjB,2HAAA,wBAAwB,OAAA"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { InstallableClient, InstallResult } from './types';
|
|
2
|
-
import { McpServerConfig } from '../init/types';
|
|
2
|
+
import { McpServerConfig, StdioServerConfig } from '../init/types';
|
|
3
3
|
export interface InstallFlags {
|
|
4
4
|
claudeDesktop?: boolean;
|
|
5
5
|
claudeCode?: boolean;
|
|
@@ -8,6 +8,8 @@ export interface InstallFlags {
|
|
|
8
8
|
cline?: boolean;
|
|
9
9
|
rooCode?: boolean;
|
|
10
10
|
windsurf?: boolean;
|
|
11
|
+
codex?: boolean;
|
|
12
|
+
url?: string;
|
|
11
13
|
all?: boolean;
|
|
12
14
|
show?: boolean;
|
|
13
15
|
force?: boolean;
|
|
@@ -16,4 +18,5 @@ export declare function parseInstallFlags(args: string[]): InstallFlags;
|
|
|
16
18
|
export declare function getClientsFromFlags(flags: InstallFlags): InstallableClient[];
|
|
17
19
|
export declare function runInstallWizard(serverConfig: McpServerConfig, flags?: InstallFlags): Promise<InstallResult[]>;
|
|
18
20
|
export declare function runInstallCommand(serverConfig: McpServerConfig, flags: InstallFlags): Promise<InstallResult[]>;
|
|
19
|
-
export declare function
|
|
21
|
+
export declare function buildServerConfig(flags: InstallFlags): McpServerConfig;
|
|
22
|
+
export declare function buildServerConfigFromEnv(): StdioServerConfig;
|
|
@@ -37,15 +37,35 @@ exports.parseInstallFlags = parseInstallFlags;
|
|
|
37
37
|
exports.getClientsFromFlags = getClientsFromFlags;
|
|
38
38
|
exports.runInstallWizard = runInstallWizard;
|
|
39
39
|
exports.runInstallCommand = runInstallCommand;
|
|
40
|
+
exports.buildServerConfig = buildServerConfig;
|
|
40
41
|
exports.buildServerConfigFromEnv = buildServerConfigFromEnv;
|
|
41
42
|
const p = __importStar(require("@clack/prompts"));
|
|
42
43
|
const types_1 = require("./types");
|
|
43
44
|
const detector_1 = require("./detector");
|
|
44
45
|
const installers_1 = require("./installers");
|
|
46
|
+
const validate_1 = require("../plugin/validate");
|
|
47
|
+
const notes_1 = require("./notes");
|
|
45
48
|
function parseInstallFlags(args) {
|
|
46
49
|
const flags = {};
|
|
47
|
-
for (
|
|
50
|
+
for (let i = 0; i < args.length; i++) {
|
|
51
|
+
const arg = args[i];
|
|
52
|
+
if (arg.startsWith('--url=')) {
|
|
53
|
+
flags.url = arg.slice('--url='.length);
|
|
54
|
+
continue;
|
|
55
|
+
}
|
|
48
56
|
switch (arg) {
|
|
57
|
+
case '--url': {
|
|
58
|
+
const value = args[i + 1];
|
|
59
|
+
if (value === undefined || value.startsWith('--')) {
|
|
60
|
+
throw new Error('--url needs the MCP endpoint, e.g. --url https://mcp.example.com/mcp');
|
|
61
|
+
}
|
|
62
|
+
flags.url = value;
|
|
63
|
+
i++;
|
|
64
|
+
break;
|
|
65
|
+
}
|
|
66
|
+
case '--codex':
|
|
67
|
+
flags.codex = true;
|
|
68
|
+
break;
|
|
49
69
|
case '--claude-desktop':
|
|
50
70
|
flags.claudeDesktop = true;
|
|
51
71
|
break;
|
|
@@ -96,6 +116,8 @@ function getClientsFromFlags(flags) {
|
|
|
96
116
|
clients.push('roo-code');
|
|
97
117
|
if (flags.windsurf)
|
|
98
118
|
clients.push('windsurf');
|
|
119
|
+
if (flags.codex)
|
|
120
|
+
clients.push('codex');
|
|
99
121
|
return clients;
|
|
100
122
|
}
|
|
101
123
|
function formatDetectionResult(result) {
|
|
@@ -227,6 +249,7 @@ async function runInstallWizard(serverConfig, flags = {}) {
|
|
|
227
249
|
info += `\n Backup: ${result.backupPath}`;
|
|
228
250
|
}
|
|
229
251
|
console.log(info);
|
|
252
|
+
(0, notes_1.printNotes)(result, console.log);
|
|
230
253
|
}
|
|
231
254
|
}
|
|
232
255
|
if (failed.length > 0) {
|
|
@@ -234,6 +257,7 @@ async function runInstallWizard(serverConfig, flags = {}) {
|
|
|
234
257
|
for (const result of failed) {
|
|
235
258
|
const metadata = types_1.CLIENT_METADATA[result.client];
|
|
236
259
|
console.log(` ✗ ${metadata.name}: ${result.error}`);
|
|
260
|
+
(0, notes_1.printNotes)(result, console.log);
|
|
237
261
|
}
|
|
238
262
|
}
|
|
239
263
|
p.outro(successful.length > 0
|
|
@@ -253,17 +277,25 @@ async function runInstallCommand(serverConfig, flags) {
|
|
|
253
277
|
if (specifiedClients.length > 0 || flags.all) {
|
|
254
278
|
const detected = (0, detector_1.getDetectedClients)();
|
|
255
279
|
let targetClients;
|
|
280
|
+
const missing = [];
|
|
256
281
|
if (flags.all) {
|
|
257
282
|
targetClients = detected.map((r) => r.client);
|
|
283
|
+
if (targetClients.length === 0)
|
|
284
|
+
throw new Error('No supported MCP clients detected.');
|
|
258
285
|
}
|
|
259
286
|
else {
|
|
260
287
|
targetClients = specifiedClients.filter((c) => detected.some((d) => d.client === c));
|
|
288
|
+
for (const client of specifiedClients.filter((c) => !targetClients.includes(c))) {
|
|
289
|
+
const name = types_1.CLIENT_METADATA[client].name;
|
|
290
|
+
missing.push({ client, success: false, error: `${name} is not installed` });
|
|
291
|
+
}
|
|
261
292
|
}
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
293
|
+
const results = [
|
|
294
|
+
...missing,
|
|
295
|
+
...(targetClients.length > 0
|
|
296
|
+
? (0, installers_1.installToClients)(targetClients, serverConfig, flags.force ?? false)
|
|
297
|
+
: []),
|
|
298
|
+
];
|
|
267
299
|
for (const result of results) {
|
|
268
300
|
const metadata = types_1.CLIENT_METADATA[result.client];
|
|
269
301
|
if (result.success) {
|
|
@@ -271,21 +303,33 @@ async function runInstallCommand(serverConfig, flags) {
|
|
|
271
303
|
if (result.backupPath) {
|
|
272
304
|
console.log(` Backup created: ${result.backupPath}`);
|
|
273
305
|
}
|
|
306
|
+
(0, notes_1.printNotes)(result, console.log);
|
|
274
307
|
}
|
|
275
308
|
else {
|
|
276
309
|
console.error(`✗ Failed for ${metadata.name}: ${result.error}`);
|
|
310
|
+
(0, notes_1.printNotes)(result, console.error);
|
|
277
311
|
}
|
|
278
312
|
}
|
|
279
313
|
return results;
|
|
280
314
|
}
|
|
281
315
|
return runInstallWizard(serverConfig, flags);
|
|
282
316
|
}
|
|
317
|
+
function buildServerConfig(flags) {
|
|
318
|
+
if (flags.url !== undefined) {
|
|
319
|
+
const clients = getClientsFromFlags(flags);
|
|
320
|
+
if (flags.all || clients.length !== 1 || clients[0] !== 'codex') {
|
|
321
|
+
throw new Error('--url registers a remote server in Codex only; use it with --codex alone');
|
|
322
|
+
}
|
|
323
|
+
return { url: (0, validate_1.validateEndpoint)(flags.url, 'private').href };
|
|
324
|
+
}
|
|
325
|
+
return buildServerConfigFromEnv();
|
|
326
|
+
}
|
|
283
327
|
function buildServerConfigFromEnv() {
|
|
284
|
-
const instanceUrl = process.env.
|
|
328
|
+
const instanceUrl = process.env.GITLAB_API_URL ?? 'https://gitlab.com';
|
|
285
329
|
const token = process.env.GITLAB_TOKEN ?? '';
|
|
286
330
|
const preset = process.env.GITLAB_MCP_PRESET;
|
|
287
331
|
const env = {
|
|
288
|
-
|
|
332
|
+
GITLAB_API_URL: instanceUrl,
|
|
289
333
|
GITLAB_TOKEN: token,
|
|
290
334
|
};
|
|
291
335
|
if (preset) {
|