mirror of
https://github.com/QwenLM/qwen-code.git
synced 2026-04-28 11:41:04 +00:00
Merge branch 'main' into feat/debug-logging-refactor
Co-authored-by: Qwen-Coder <qwen-coder@alibabacloud.com>
This commit is contained in:
commit
135df54f27
378 changed files with 40051 additions and 6776 deletions
|
|
@ -60,6 +60,7 @@ import { writeStderrLine } from './utils/stdioHelpers.js';
|
|||
import { computeWindowTitle } from './utils/windowTitle.js';
|
||||
import { validateNonInteractiveAuth } from './validateNonInterActiveAuth.js';
|
||||
import { showResumeSessionPicker } from './ui/components/StandaloneSessionPicker.js';
|
||||
import { initializeLlmOutputLanguage } from './utils/languageUtils.js';
|
||||
|
||||
const debugLogger = createDebugLogger('STARTUP');
|
||||
|
||||
|
|
@ -261,7 +262,7 @@ export async function main() {
|
|||
if (!settings.merged.security?.auth?.useExternal) {
|
||||
// Validate authentication here because the sandbox will interfere with the Oauth2 web redirect.
|
||||
try {
|
||||
const authType = partialConfig.modelsConfig.getCurrentAuthType();
|
||||
const authType = partialConfig.getModelsConfig().getCurrentAuthType();
|
||||
// Fresh users may not have selected/persisted an authType yet.
|
||||
// In that case, defer auth prompting/selection to the main interactive flow.
|
||||
if (authType) {
|
||||
|
|
@ -336,6 +337,10 @@ export async function main() {
|
|||
// We are now past the logic handling potentially launching a child process
|
||||
// to run Gemini CLI. It is now safe to perform expensive initialization that
|
||||
// may have side effects.
|
||||
|
||||
// Initialize output language file before config loads to ensure it's included in context
|
||||
initializeLlmOutputLanguage(settings.merged.general?.outputLanguage);
|
||||
|
||||
{
|
||||
const config = await loadCliConfig(
|
||||
settings.merged,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue