Skip to content

CLI-1520 Update MCP launch configuration #1238

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nquinquenel merged 3 commits into from
Nov 10, 2026
Merged

CLI-1520 Update MCP launch configuration #1238

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dd76741
Maintenance update B
nquinquenel Nov 9, 2026
587f998
Maintenance update
nquinquenel Nov 10, 2026
4783e74
Maintenance update
nquinquenel Nov 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 41 additions & 2 deletions src/commands/run/mcp.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

// Run the SonarQube MCP server, proxying stdio for MCP transport

import { spawn } from 'node:child_process';
import { type ChildProcess, spawn } from 'node:child_process';
import { rmSync } from 'node:fs';
import { homedir } from 'node:os';
import { createInterface } from 'node:readline';
Expand All @@ -38,6 +38,7 @@ import {
type McpServerContext,
resolveMcpContainerCommand,
} from '@/core/host/mcp/mcp-helper.ts';
import { removeJvmSecretsFile } from '@/core/host/mcp/mcp-jvm-secrets.ts';
import {
isLoopbackServerUrl,
mcpLoopbackAdvice,
Expand All @@ -60,6 +61,7 @@ export interface McpRunOptions {

const AUTHENTICATION_ERROR_MESSAGE = "Not authenticated. Run 'sonar auth login' to authenticate.";
const INTERNAL_ERROR_CODE = -32000;
const HANGUP_EXIT_CODE = 129;
const INTERRUPTED_EXIT_CODE = 130;
const TERMINATED_EXIT_CODE = 143;
const CONTAINER_SHUTDOWN_EXIT_CODES = new Set([INTERRUPTED_EXIT_CODE, TERMINATED_EXIT_CODE]);
Expand All @@ -76,6 +78,8 @@ export async function runMcp(
): Promise<void> {
let resolvedNetwork: ResolvedNetworkConfig | undefined;
let cachedCaCertPath: string | undefined;
let child: ChildProcess | undefined;
let disposeJvmSecrets: (() => void) | undefined;
try {
resolvedNetwork = network ?? (await getNetworkConfigOrThrow());
const authResult = await ctx.resolveAuth();
Expand Down Expand Up @@ -137,6 +141,9 @@ export async function runMcp(
resolvedNetwork,
);
cachedCaCertPath = config.cachedCaCertPath;
if (config.jvmSecretsPath) {
disposeJvmSecrets = ownJvmSecrets(config.jvmSecretsPath, () => child);
}

if (options.debug) {
debugLog(`runtime: ${detection.runtime}${detection.viaWsl ? ' (via WSL)' : ''}`);
Expand All @@ -146,7 +153,7 @@ export async function runMcp(
}

await new Promise<void>((resolve, reject) => {
const child = spawn(config.command, config.args, {
child = spawn(config.command, config.args, {
stdio: 'inherit',
env: { ...process.env, ...config.env },
});
Expand All @@ -169,9 +176,12 @@ export async function runMcp(
resolve();
});
});
disposeJvmSecrets?.();
} catch (error) {
disposeJvmSecrets?.();
await failStartup(error);
} finally {
disposeJvmSecrets?.();
if (resolvedNetwork) {
cleanup(resolvedNetwork);
}
Expand Down Expand Up @@ -207,6 +217,35 @@ export async function runMcp(
}
}

function ownJvmSecrets(path: string, getChild: () => ChildProcess | undefined): () => void {
const handlers = new Map<NodeJS.Signals, () => void>();
let disposed = false;
const dispose = () => {
if (disposed) return;
disposed = true;
for (const [signal, handler] of handlers) process.off(signal, handler);
removeJvmSecretsFile(path);
};
for (const [signal, code] of [
['SIGHUP', HANGUP_EXIT_CODE],
['SIGINT', INTERRUPTED_EXIT_CODE],
['SIGTERM', TERMINATED_EXIT_CODE],
] as const) {
const handler = () => {
dispose();
try {
getChild()?.kill(signal);
} catch {
// Cleanup and exit must finish even if the runtime cannot receive the signal.
}
process.exit(code);
};
handlers.set(signal, handler);
process.on(signal, handler);
}
return dispose;
}

function runtimeDetectionError(detection: ContainerRuntimeDetection): CommandFailedError {
const failure = detection.nativeFailure;
if (failure) {
Expand Down
Loading