fix(opencode): pass full MCP launch args
This commit is contained in:
parent
0b28d8f4b2
commit
f391dda3cb
5 changed files with 17 additions and 11 deletions
|
|
@ -268,6 +268,7 @@ async function createOpenCodeRuntimeAdapterRegistry(): Promise<TeamRuntimeAdapte
|
||||||
if (mcpEntry) {
|
if (mcpEntry) {
|
||||||
bridgeEnv.CLAUDE_MULTIMODEL_AGENT_TEAMS_MCP_COMMAND = mcpLaunchSpec.command;
|
bridgeEnv.CLAUDE_MULTIMODEL_AGENT_TEAMS_MCP_COMMAND = mcpLaunchSpec.command;
|
||||||
bridgeEnv.CLAUDE_MULTIMODEL_AGENT_TEAMS_MCP_ENTRY = mcpEntry;
|
bridgeEnv.CLAUDE_MULTIMODEL_AGENT_TEAMS_MCP_ENTRY = mcpEntry;
|
||||||
|
bridgeEnv.CLAUDE_MULTIMODEL_AGENT_TEAMS_MCP_ARGS_JSON = JSON.stringify(mcpLaunchSpec.args);
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
logger.warn(
|
logger.warn(
|
||||||
|
|
|
||||||
|
|
@ -79,6 +79,7 @@ liveDescribe('OpenCode mixed recovery live e2e', () => {
|
||||||
XDG_DATA_HOME: path.join(tempDir, 'xdg-data-single'),
|
XDG_DATA_HOME: path.join(tempDir, 'xdg-data-single'),
|
||||||
CLAUDE_MULTIMODEL_AGENT_TEAMS_MCP_COMMAND: mcpLaunchSpec.command,
|
CLAUDE_MULTIMODEL_AGENT_TEAMS_MCP_COMMAND: mcpLaunchSpec.command,
|
||||||
CLAUDE_MULTIMODEL_AGENT_TEAMS_MCP_ENTRY: mcpLaunchSpec.args[0] ?? '',
|
CLAUDE_MULTIMODEL_AGENT_TEAMS_MCP_ENTRY: mcpLaunchSpec.args[0] ?? '',
|
||||||
|
CLAUDE_MULTIMODEL_AGENT_TEAMS_MCP_ARGS_JSON: JSON.stringify(mcpLaunchSpec.args),
|
||||||
};
|
};
|
||||||
const bridgeClient = new OpenCodeBridgeCommandClient({
|
const bridgeClient = new OpenCodeBridgeCommandClient({
|
||||||
binaryPath: orchestratorCli,
|
binaryPath: orchestratorCli,
|
||||||
|
|
@ -182,6 +183,7 @@ liveDescribe('OpenCode mixed recovery live e2e', () => {
|
||||||
XDG_DATA_HOME: path.join(tempDir, 'xdg-data-multi'),
|
XDG_DATA_HOME: path.join(tempDir, 'xdg-data-multi'),
|
||||||
CLAUDE_MULTIMODEL_AGENT_TEAMS_MCP_COMMAND: mcpLaunchSpec.command,
|
CLAUDE_MULTIMODEL_AGENT_TEAMS_MCP_COMMAND: mcpLaunchSpec.command,
|
||||||
CLAUDE_MULTIMODEL_AGENT_TEAMS_MCP_ENTRY: mcpLaunchSpec.args[0] ?? '',
|
CLAUDE_MULTIMODEL_AGENT_TEAMS_MCP_ENTRY: mcpLaunchSpec.args[0] ?? '',
|
||||||
|
CLAUDE_MULTIMODEL_AGENT_TEAMS_MCP_ARGS_JSON: JSON.stringify(mcpLaunchSpec.args),
|
||||||
};
|
};
|
||||||
const bridgeClient = new OpenCodeBridgeCommandClient({
|
const bridgeClient = new OpenCodeBridgeCommandClient({
|
||||||
binaryPath: orchestratorCli,
|
binaryPath: orchestratorCli,
|
||||||
|
|
|
||||||
|
|
@ -69,6 +69,7 @@ liveDescribe('OpenCode team provisioning live e2e', () => {
|
||||||
XDG_DATA_HOME: path.join(tempDir, 'xdg-data'),
|
XDG_DATA_HOME: path.join(tempDir, 'xdg-data'),
|
||||||
CLAUDE_MULTIMODEL_AGENT_TEAMS_MCP_COMMAND: mcpLaunchSpec.command,
|
CLAUDE_MULTIMODEL_AGENT_TEAMS_MCP_COMMAND: mcpLaunchSpec.command,
|
||||||
CLAUDE_MULTIMODEL_AGENT_TEAMS_MCP_ENTRY: mcpLaunchSpec.args[0] ?? '',
|
CLAUDE_MULTIMODEL_AGENT_TEAMS_MCP_ENTRY: mcpLaunchSpec.args[0] ?? '',
|
||||||
|
CLAUDE_MULTIMODEL_AGENT_TEAMS_MCP_ARGS_JSON: JSON.stringify(mcpLaunchSpec.args),
|
||||||
};
|
};
|
||||||
const bridgeClient = new OpenCodeBridgeCommandClient({
|
const bridgeClient = new OpenCodeBridgeCommandClient({
|
||||||
binaryPath: orchestratorCli,
|
binaryPath: orchestratorCli,
|
||||||
|
|
|
||||||
|
|
@ -128,22 +128,23 @@ function getRealAgentTeamsMcpLaunchSpec(): { command: string; args: string[] } {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const distEntry = path.join(workspaceRoot, 'mcp-server', 'dist', 'index.js');
|
const tsxCommand = path.join(
|
||||||
if (fs.existsSync(distEntry)) {
|
workspaceRoot,
|
||||||
|
'node_modules',
|
||||||
|
'.bin',
|
||||||
|
process.platform === 'win32' ? 'tsx.cmd' : 'tsx'
|
||||||
|
);
|
||||||
|
if (fs.existsSync(sourceEntry) && fs.existsSync(tsxCommand)) {
|
||||||
return {
|
return {
|
||||||
command: process.execPath,
|
command: tsxCommand,
|
||||||
args: [distEntry],
|
args: [sourceEntry],
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const distEntry = path.join(workspaceRoot, 'mcp-server', 'dist', 'index.js');
|
||||||
return {
|
return {
|
||||||
command: path.join(
|
command: process.execPath,
|
||||||
workspaceRoot,
|
args: [distEntry],
|
||||||
'node_modules',
|
|
||||||
'.bin',
|
|
||||||
process.platform === 'win32' ? 'tsx.cmd' : 'tsx'
|
|
||||||
),
|
|
||||||
args: [path.join(workspaceRoot, 'mcp-server', 'src', 'index.ts')],
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -73,6 +73,7 @@ export async function createOpenCodeLiveHarness(input: {
|
||||||
CLAUDE_TEAM_CONTROL_URL: controlApi.baseUrl,
|
CLAUDE_TEAM_CONTROL_URL: controlApi.baseUrl,
|
||||||
CLAUDE_MULTIMODEL_AGENT_TEAMS_MCP_COMMAND: mcpLaunchSpec.command,
|
CLAUDE_MULTIMODEL_AGENT_TEAMS_MCP_COMMAND: mcpLaunchSpec.command,
|
||||||
CLAUDE_MULTIMODEL_AGENT_TEAMS_MCP_ENTRY: mcpLaunchSpec.args[0] ?? '',
|
CLAUDE_MULTIMODEL_AGENT_TEAMS_MCP_ENTRY: mcpLaunchSpec.args[0] ?? '',
|
||||||
|
CLAUDE_MULTIMODEL_AGENT_TEAMS_MCP_ARGS_JSON: JSON.stringify(mcpLaunchSpec.args),
|
||||||
};
|
};
|
||||||
if (process.env.OPENCODE_E2E_USE_REAL_APP_CREDENTIALS !== '1') {
|
if (process.env.OPENCODE_E2E_USE_REAL_APP_CREDENTIALS !== '1') {
|
||||||
bridgeEnv.XDG_DATA_HOME = path.join(input.tempDir, 'xdg-data');
|
bridgeEnv.XDG_DATA_HOME = path.join(input.tempDir, 'xdg-data');
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue