Skip to content

fix: Handle -- separator in command arguments to prevent timeout #23

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
punkpeye merged 3 commits into from
Jul 1, 2025
Merged

fix: Handle -- separator in command arguments to prevent timeout #23

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
173a8c6
fix: Handle -- separator in command arguments to prevent timeout
yubingjiaocn Jun 22, 2025
e049182
fix: use "populate--" to handle command args
yubingjiaocn Jun 23, 2025
e64ac2c
fix: revert hidebin removal
yubingjiaocn Jul 1, 2025
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
23 changes: 17 additions & 6 deletions src/bin/mcp-proxy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import { EventSource } from "eventsource";
import { setTimeout } from "node:timers";
import util from "node:util";
import yargs from "yargs";
import { hideBin } from "yargs/helpers";

import { InMemoryEventStore } from "../InMemoryEventStore.js";
import { proxyServer } from "../proxyServer.js";
Expand All @@ -20,20 +19,23 @@ if (!("EventSource" in global)) {
global.EventSource = EventSource;
}

const argv = await yargs(hideBin(process.argv))
const argv = await yargs(process.argv.slice(2))
.scriptName("mcp-proxy")
.command("$0 <command> [args...]", "Run a command with MCP arguments")
.command("$0 [command] [args...]", "Run a command with MCP arguments")
.positional("command", {
demandOption: true,
describe: "The command to run",
type: "string",
})
.positional("args", {
array: true,
describe: "The arguments to pass to the command",
describe: "The arguments to pass to the command",
type: "string",
})
.env("MCP_PROXY")
.parserConfiguration({
"populate--": true
})
.options({
debug: {
default: false,
Expand Down Expand Up @@ -73,10 +75,19 @@ const argv = await yargs(hideBin(process.argv))
.help()
.parseAsync();

// Determine the final command and args
if (!argv.command) {
throw new Error("No command specified");
}

const finalCommand = argv.command;
// If -- separator was used, args after -- are in argv["--"], otherwise use parsed args
const finalArgs = (argv["--"] as string[]) || argv.args;

const connect = async (client: Client) => {
const transport = new StdioClientTransport({
args: argv.args,
command: argv.command,
args: finalArgs,
command: finalCommand,
env: process.env as Record<string, string>,
onEvent: (event) => {
if (argv.debug) {
Expand Down