vrr/claude-code-router
2
0
Fork 0
mirror of https://github.com/musistudio/claude-code-router.git synced 2026-05-23 04:10:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 6dbdd685c4 into e270dea523

Browse source
This commit is contained in:
0xpep7 2026-04-27 02:58:26 +07:00 • committed by GitHub
commit 9327ea1a4d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 27 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

30
packages/cli/src/utils/codeCommand.ts
View file

@ -83,9 +83,33 @@ export async function executeCodeCommand(
}
}
const settingsFile = await getSettingsPath(`${JSON.stringify(settingsFlag)}`)
args.push('--settings', settingsFile);
// merge --settings args if exists with settingsFlag:
// new settingsFlag = {...settingsFlag, ...args['--settings']}
const joinedSettingsArgs = args.includes('--settings') ? args.slice(args.indexOf('--settings') + 1) : [];
console.log(`joinedSettingsArgs : ${joinedSettingsArgs}`);
if (joinedSettingsArgs.length > 0) {
try {
const parsedSettingsArgs = JSON.parse(joinedSettingsArgs[0]);
settingsFlag = {
...settingsFlag,
...parsedSettingsArgs,
env: {
...settingsFlag.env,
...parsedSettingsArgs.env,
} as ClaudeSettingsFlag['env']
};
console.log(`Merged settingsFlag with --settings args: ${JSON.stringify(settingsFlag)}`);
} catch (error) {
console.error(`Failed to parse --settings argument: ${joinedSettingsArgs[0]}`, error);
}
const settingsFile = await getSettingsPath(`${JSON.stringify(settingsFlag)}`);
// overwrite the --settings arg with the new settings file path
const settingsIndex = args.indexOf('--settings');
args[settingsIndex + 1] = settingsFile;
} else {
const settingsFile = await getSettingsPath(`${JSON.stringify(settingsFlag)}`);
args.push('--settings', settingsFile);
}
// Increment reference count when command starts
incrementReferenceCount();