Merge branch 'main' into tool-search
This commit is contained in:
commit
ae9246314c
2 changed files with 2 additions and 2 deletions
|
|
@ -32,8 +32,8 @@ function createStdioTransport(options: TransportOptions): Transport {
|
||||||
const defaultEnv = getDefaultEnvironment();
|
const defaultEnv = getDefaultEnvironment();
|
||||||
|
|
||||||
const env: Record<string, string> = {
|
const env: Record<string, string> = {
|
||||||
...processEnv,
|
|
||||||
...defaultEnv,
|
...defaultEnv,
|
||||||
|
...processEnv,
|
||||||
};
|
};
|
||||||
|
|
||||||
const { cmd: actualCommand, args: actualArgs } = findActualExecutable(
|
const { cmd: actualCommand, args: actualArgs } = findActualExecutable(
|
||||||
|
|
|
||||||
|
|
@ -184,7 +184,7 @@ const createTransport = async (req: express.Request): Promise<Transport> => {
|
||||||
const command = query.command as string;
|
const command = query.command as string;
|
||||||
const origArgs = shellParseArgs(query.args as string) as string[];
|
const origArgs = shellParseArgs(query.args as string) as string[];
|
||||||
const queryEnv = query.env ? JSON.parse(query.env as string) : {};
|
const queryEnv = query.env ? JSON.parse(query.env as string) : {};
|
||||||
const env = { ...process.env, ...defaultEnvironment, ...queryEnv };
|
const env = { ...defaultEnvironment, ...process.env, ...queryEnv };
|
||||||
|
|
||||||
const { cmd, args } = findActualExecutable(command, origArgs);
|
const { cmd, args } = findActualExecutable(command, origArgs);
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue