vrr/qwen-code
2
0
Fork 0
mirror of https://github.com/QwenLM/qwen-code.git synced 2026-04-30 12:40:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 21

refactor: unify sandbox configuration naming and improve telemetry config

Browse source 
Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com>
This commit is contained in:
pomelo-nwu 2026-02-11 11:08:15 +08:00
parent 66f754e203
commit 8b3aeb4550
24 changed files with 141 additions and 143 deletions
Download patch file Download diff file Expand all files Collapse all files

30
scripts/sandbox_command.js
View file

@ -32,27 +32,27 @@ const argv = yargs(hideBin(process.argv)).option('q', {
default: false,
}).argv;
let geminiSandbox = process.env.GEMINI_SANDBOX;
let qwenSandbox = process.env.QWEN_SANDBOX;
if (!geminiSandbox) {
if (!qwenSandbox) {
const userSettingsFile = join(os.homedir(), '.qwen', 'settings.json');
if (existsSync(userSettingsFile)) {
const settings = JSON.parse(
stripJsonComments(readFileSync(userSettingsFile, 'utf-8')),
);
if (settings.sandbox) {
geminiSandbox = settings.sandbox;
qwenSandbox = settings.sandbox;
}
}
}
if (!geminiSandbox) {
if (!qwenSandbox) {
let currentDir = process.cwd();
while (true) {
const geminiEnv = join(currentDir, '.qwen', '.env');
const qwenEnv = join(currentDir, '.qwen', '.env');
const regularEnv = join(currentDir, '.env');
if (existsSync(geminiEnv)) {
dotenv.config({ path: geminiEnv, quiet: true });
if (existsSync(qwenEnv)) {
dotenv.config({ path: qwenEnv, quiet: true });
break;
} else if (existsSync(regularEnv)) {
dotenv.config({ path: regularEnv, quiet: true });
@ -64,10 +64,10 @@ if (!geminiSandbox) {
}
currentDir = parentDir;
}
geminiSandbox = process.env.GEMINI_SANDBOX;
qwenSandbox = process.env.QWEN_SANDBOX;
}
geminiSandbox = (geminiSandbox || '').toLowerCase();
qwenSandbox = (qwenSandbox || '').toLowerCase();
const commandExists = (cmd) => {
// Use 'where.exe' (not 'where') on Windows because PowerShell aliases
@ -90,23 +90,23 @@ const commandExists = (cmd) => {
};
let command = '';
if (['1', 'true'].includes(geminiSandbox)) {
if (['1', 'true'].includes(qwenSandbox)) {
if (commandExists('docker')) {
command = 'docker';
} else if (commandExists('podman')) {
command = 'podman';
} else {
console.error(
'ERROR: install docker or podman or specify command in GEMINI_SANDBOX',
'ERROR: install docker or podman or specify command in QWEN_SANDBOX',
);
process.exit(1);
}
} else if (geminiSandbox && !['0', 'false'].includes(geminiSandbox)) {
if (commandExists(geminiSandbox)) {
command = geminiSandbox;
} else if (qwenSandbox && !['0', 'false'].includes(qwenSandbox)) {
if (commandExists(qwenSandbox)) {
command = qwenSandbox;
} else {
console.error(
`ERROR: missing sandbox command '${geminiSandbox}' (from GEMINI_SANDBOX)`,
`ERROR: missing sandbox command '${qwenSandbox}' (from QWEN_SANDBOX)`,
);
process.exit(1);
}