@qwen-code/qwen-code 0.18.3 → 0.18.4

package/chunks/{chunk-O2HKIE5I.js → chunk-GBTJHKQ6.js}

@@ -1,12 +1,13 @@
 // Force strict mode and setup for ESM
 "use strict";
 import {
+  SUPPORTED_LANGUAGES,
   detectSystemLanguage,
   getLanguageNameFromLocale,
   getLanguageSettingsOptions,
   t,
   writeStderrLine
-} from "./chunk-MRULXYE3.js";
+} from "./chunk-SZWDOOGV.js";
 import {
   DEFAULT_STOP_HOOK_BLOCK_CAP,
   DEFAULT_TOOL_OUTPUT_BATCH_BUDGET,
@@ -17,21 +18,21 @@ import {
   SkillError,
   ideContextStore,
   require_main
-} from "./chunk-OY2G3EH4.js";
+} from "./chunk-32SSXBMG.js";
 import {
   isWithinRoot,
   stripRuntimeSnapshotPrefix
-} from "./chunk-K3CCX4PX.js";
+} from "./chunk-6Z2MVJIJ.js";
 import {
   atomicWriteFileSync
-} from "./chunk-LXYWINWF.js";
+} from "./chunk-N5QHMPZU.js";
 import {
   FatalConfigError,
   QWEN_DIR,
   Storage,
   createDebugLogger,
   getErrorMessage
-} from "./chunk-HA2UEYZP.js";
+} from "./chunk-IKOWINH4.js";
 import {
   init_esbuild_shims
 } from "./chunk-A4BMJM77.js";
@@ -42,79 +43,6 @@ import {
   __toESM
 } from "./chunk-J2S4EL5Y.js";
 
-// node_modules/strip-json-comments/index.js
-var require_strip_json_comments = __commonJS({
-  "node_modules/strip-json-comments/index.js"(exports, module) {
-    "use strict";
-    init_esbuild_shims();
-    var singleComment = Symbol("singleComment");
-    var multiComment = Symbol("multiComment");
-    var stripWithoutWhitespace = /* @__PURE__ */ __name(() => "", "stripWithoutWhitespace");
-    var stripWithWhitespace = /* @__PURE__ */ __name((string, start, end) => string.slice(start, end).replace(/\S/g, " "), "stripWithWhitespace");
-    var isEscaped = /* @__PURE__ */ __name((jsonString, quotePosition) => {
-      let index = quotePosition - 1;
-      let backslashCount = 0;
-      while (jsonString[index] === "\\") {
-        index -= 1;
-        backslashCount += 1;
-      }
-      return Boolean(backslashCount % 2);
-    }, "isEscaped");
-    module.exports = (jsonString, options = {}) => {
-      if (typeof jsonString !== "string") {
-        throw new TypeError(`Expected argument \`jsonString\` to be a \`string\`, got \`${typeof jsonString}\``);
-      }
-      const strip = options.whitespace === false ? stripWithoutWhitespace : stripWithWhitespace;
-      let insideString = false;
-      let insideComment = false;
-      let offset = 0;
-      let result = "";
-      for (let i = 0; i < jsonString.length; i++) {
-        const currentCharacter = jsonString[i];
-        const nextCharacter = jsonString[i + 1];
-        if (!insideComment && currentCharacter === '"') {
-          const escaped = isEscaped(jsonString, i);
-          if (!escaped) {
-            insideString = !insideString;
-          }
-        }
-        if (insideString) {
-          continue;
-        }
-        if (!insideComment && currentCharacter + nextCharacter === "//") {
-          result += jsonString.slice(offset, i);
-          offset = i;
-          insideComment = singleComment;
-          i++;
-        } else if (insideComment === singleComment && currentCharacter + nextCharacter === "\r\n") {
-          i++;
-          insideComment = false;
-          result += strip(jsonString, offset, i);
-          offset = i;
-          continue;
-        } else if (insideComment === singleComment && currentCharacter === "\n") {
-          insideComment = false;
-          result += strip(jsonString, offset, i);
-          offset = i;
-        } else if (!insideComment && currentCharacter + nextCharacter === "/*") {
-          result += jsonString.slice(offset, i);
-          offset = i;
-          insideComment = multiComment;
-          i++;
-          continue;
-        } else if (insideComment === multiComment && currentCharacter + nextCharacter === "*/") {
-          i++;
-          insideComment = false;
-          result += strip(jsonString, offset, i + 1);
-          offset = i + 1;
-          continue;
-        }
-      }
-      return result + (insideComment ? strip(jsonString.slice(offset)) : jsonString.slice(offset));
-    };
-  }
-});
-
 // node_modules/esprima/dist/esprima.js
 var require_esprima = __commonJS({
   "node_modules/esprima/dist/esprima.js"(exports, module) {
@@ -164,7 +92,7 @@ var require_esprima = __commonJS({
             var jsx_parser_1 = __webpack_require__(3);
             var parser_1 = __webpack_require__(8);
             var tokenizer_1 = __webpack_require__(15);
-            function parse3(code, options, delegate) {
+            function parse4(code, options, delegate) {
               var commentHandler = null;
               var proxyDelegate = /* @__PURE__ */ __name(function(node, metadata) {
                 if (delegate) {
@@ -209,19 +137,19 @@ var require_esprima = __commonJS({
               }
               return ast;
             }
-            __name(parse3, "parse");
-            exports2.parse = parse3;
+            __name(parse4, "parse");
+            exports2.parse = parse4;
             function parseModule(code, options, delegate) {
               var parsingOptions = options || {};
               parsingOptions.sourceType = "module";
-              return parse3(code, parsingOptions, delegate);
+              return parse4(code, parsingOptions, delegate);
             }
             __name(parseModule, "parseModule");
             exports2.parseModule = parseModule;
             function parseScript(code, options, delegate) {
               var parsingOptions = options || {};
               parsingOptions.sourceType = "script";
-              return parse3(code, parsingOptions, delegate);
+              return parse4(code, parsingOptions, delegate);
             }
             __name(parseScript, "parseScript");
             exports2.parseScript = parseScript;
@@ -7862,7 +7790,7 @@ var require_parse = __commonJS({
     }
     __name(walk, "walk");
     var isObject = /* @__PURE__ */ __name((subject) => Object(subject) === subject, "isObject");
-    var parse3 = /* @__PURE__ */ __name((code, rev, no_comments) => {
+    var parse4 = /* @__PURE__ */ __name((code, rev, no_comments) => {
       clean();
       tokens = tokenize(code);
       reviver = rev;
@@ -7891,7 +7819,7 @@ var require_parse = __commonJS({
       return result;
     }, "parse");
     module.exports = {
-      parse: parse3,
+      parse: parse4,
       tokenize
     };
   }
@@ -8035,7 +7963,7 @@ var require_stringify = __commonJS({
           deeper_gap
         );
         inside += before || LF + deeper_gap;
-        inside += stringify2(i, value, deeper_gap) || STR_NULL;
+        inside += stringify3(i, value, deeper_gap) || STR_NULL;
         inside += process_comments(value, AFTER_VALUE(i), deeper_gap);
         after_comma = process_comments(value, AFTER(i), deeper_gap);
       }
@@ -8056,7 +7984,7 @@ var require_stringify = __commonJS({
       let first = true;
       const keys = isArray(replacer) ? replacer : Object.keys(value);
       const iteratee = /* @__PURE__ */ __name((key) => {
-        const sv = stringify2(key, value, deeper_gap);
+        const sv = stringify3(key, value, deeper_gap);
         if (sv === UNDEFINED) {
           return;
         }
@@ -8081,7 +8009,7 @@ var require_stringify = __commonJS({
       );
       return CURLY_BRACKET_OPEN + join_content(inside, value, gap) + CURLY_BRACKET_CLOSE;
     }, "object_stringify");
-    function stringify2(key, holder, gap) {
+    function stringify3(key, holder, gap) {
       let value = holder[key];
       if (isObject(value) && isFunction(value.toJSON)) {
         value = value.toJSON(key);
@@ -8105,7 +8033,7 @@ var require_stringify = __commonJS({
         default:
       }
     }
-    __name(stringify2, "stringify");
+    __name(stringify3, "stringify");
     var get_indent = /* @__PURE__ */ __name((space) => isString(space) ? space : isNumber(space) ? repeat(SPACE, space) : EMPTY, "get_indent");
     var { toString } = Object.prototype;
     var PRIMITIVE_OBJECT_TYPES = [
@@ -8130,7 +8058,7 @@ var require_stringify = __commonJS({
       }
       replacer = replacer_;
       indent = indent_;
-      const str = is_primitive_object(value) ? JSON.stringify(value) : stringify2("", { "": value }, EMPTY);
+      const str = is_primitive_object(value) ? JSON.stringify(value) : stringify3("", { "": value }, EMPTY);
       clean();
       return isObject(value) ? process_comments(value, PREFIX_BEFORE_ALL, EMPTY).trimLeft() + str + process_comments(value, PREFIX_AFTER_ALL, EMPTY).trimRight() : str;
     };
@@ -8141,13 +8069,13 @@ var require_stringify = __commonJS({
 var require_src2 = __commonJS({
   "node_modules/comment-json/src/index.js"(exports, module) {
     init_esbuild_shims();
-    var { parse: parse3, tokenize } = require_parse();
-    var stringify2 = require_stringify();
+    var { parse: parse4, tokenize } = require_parse();
+    var stringify3 = require_stringify();
     var { CommentArray } = require_array();
     var { assign } = require_common();
     module.exports = {
-      parse: parse3,
-      stringify: stringify2,
+      parse: parse4,
+      stringify: stringify3,
       tokenize,
       CommentArray,
       assign
@@ -8155,6 +8083,79 @@ var require_src2 = __commonJS({
   }
 });
 
+// node_modules/strip-json-comments/index.js
+var require_strip_json_comments = __commonJS({
+  "node_modules/strip-json-comments/index.js"(exports, module) {
+    "use strict";
+    init_esbuild_shims();
+    var singleComment = Symbol("singleComment");
+    var multiComment = Symbol("multiComment");
+    var stripWithoutWhitespace = /* @__PURE__ */ __name(() => "", "stripWithoutWhitespace");
+    var stripWithWhitespace = /* @__PURE__ */ __name((string, start, end) => string.slice(start, end).replace(/\S/g, " "), "stripWithWhitespace");
+    var isEscaped = /* @__PURE__ */ __name((jsonString, quotePosition) => {
+      let index = quotePosition - 1;
+      let backslashCount = 0;
+      while (jsonString[index] === "\\") {
+        index -= 1;
+        backslashCount += 1;
+      }
+      return Boolean(backslashCount % 2);
+    }, "isEscaped");
+    module.exports = (jsonString, options = {}) => {
+      if (typeof jsonString !== "string") {
+        throw new TypeError(`Expected argument \`jsonString\` to be a \`string\`, got \`${typeof jsonString}\``);
+      }
+      const strip = options.whitespace === false ? stripWithoutWhitespace : stripWithWhitespace;
+      let insideString = false;
+      let insideComment = false;
+      let offset = 0;
+      let result = "";
+      for (let i = 0; i < jsonString.length; i++) {
+        const currentCharacter = jsonString[i];
+        const nextCharacter = jsonString[i + 1];
+        if (!insideComment && currentCharacter === '"') {
+          const escaped = isEscaped(jsonString, i);
+          if (!escaped) {
+            insideString = !insideString;
+          }
+        }
+        if (insideString) {
+          continue;
+        }
+        if (!insideComment && currentCharacter + nextCharacter === "//") {
+          result += jsonString.slice(offset, i);
+          offset = i;
+          insideComment = singleComment;
+          i++;
+        } else if (insideComment === singleComment && currentCharacter + nextCharacter === "\r\n") {
+          i++;
+          insideComment = false;
+          result += strip(jsonString, offset, i);
+          offset = i;
+          continue;
+        } else if (insideComment === singleComment && currentCharacter === "\n") {
+          insideComment = false;
+          result += strip(jsonString, offset, i);
+          offset = i;
+        } else if (!insideComment && currentCharacter + nextCharacter === "/*") {
+          result += jsonString.slice(offset, i);
+          offset = i;
+          insideComment = multiComment;
+          i++;
+          continue;
+        } else if (insideComment === multiComment && currentCharacter + nextCharacter === "*/") {
+          i++;
+          insideComment = false;
+          result += strip(jsonString, offset, i + 1);
+          offset = i + 1;
+          continue;
+        }
+      }
+      return result + (insideComment ? strip(jsonString.slice(offset)) : jsonString.slice(offset));
+    };
+  }
+});
+
 // node_modules/picocolors/picocolors.js
 var require_picocolors = __commonJS({
   "node_modules/picocolors/picocolors.js"(exports, module) {
@@ -9125,7 +9126,7 @@ var require_parse2 = __commonJS({
     "use strict";
     init_esbuild_shims();
     var SemVer = require_semver();
-    var parse3 = /* @__PURE__ */ __name((version, options, throwErrors = false) => {
+    var parse4 = /* @__PURE__ */ __name((version, options, throwErrors = false) => {
       if (version instanceof SemVer) {
         return version;
       }
@@ -9138,7 +9139,7 @@ var require_parse2 = __commonJS({
         throw er;
       }
     }, "parse");
-    module.exports = parse3;
+    module.exports = parse4;
   }
 });
 
@@ -9147,9 +9148,9 @@ var require_valid = __commonJS({
   "node_modules/semver/functions/valid.js"(exports, module) {
     "use strict";
     init_esbuild_shims();
-    var parse3 = require_parse2();
+    var parse4 = require_parse2();
     var valid = /* @__PURE__ */ __name((version, options) => {
-      const v = parse3(version, options);
+      const v = parse4(version, options);
       return v ? v.version : null;
     }, "valid");
     module.exports = valid;
@@ -9161,9 +9162,9 @@ var require_clean = __commonJS({
   "node_modules/semver/functions/clean.js"(exports, module) {
     "use strict";
     init_esbuild_shims();
-    var parse3 = require_parse2();
+    var parse4 = require_parse2();
     var clean = /* @__PURE__ */ __name((version, options) => {
-      const s = parse3(version.trim().replace(/^[=v]+/, ""), options);
+      const s = parse4(version.trim().replace(/^[=v]+/, ""), options);
       return s ? s.version : null;
     }, "clean");
     module.exports = clean;
@@ -10180,9 +10181,9 @@ var require_spdx_expression_parse = __commonJS({
     "use strict";
     init_esbuild_shims();
     var scan = require_scan();
-    var parse3 = require_parse3();
+    var parse4 = require_parse3();
     module.exports = function(source) {
-      return parse3(scan(source));
+      return parse4(scan(source));
     };
   }
 });
@@ -10191,11 +10192,11 @@ var require_spdx_expression_parse = __commonJS({
 var require_spdx_correct = __commonJS({
   "node_modules/spdx-correct/index.js"(exports, module) {
     init_esbuild_shims();
-    var parse3 = require_spdx_expression_parse();
+    var parse4 = require_spdx_expression_parse();
     var spdxLicenseIds = require_spdx_license_ids();
     function valid(string) {
       try {
-        parse3(string);
+        parse4(string);
         return true;
       } catch (error) {
         return false;
@@ -10529,7 +10530,7 @@ var require_spdx_correct = __commonJS({
 var require_validate_npm_package_license = __commonJS({
   "node_modules/validate-npm-package-license/index.js"(exports, module) {
     init_esbuild_shims();
-    var parse3 = require_spdx_expression_parse();
+    var parse4 = require_spdx_expression_parse();
     var correct = require_spdx_correct();
     var genericWarning = 'license should be a valid SPDX license expression (without "LicenseRef"), "UNLICENSED", or "SEE LICENSE IN <filename>"';
     var fileReferenceRE = /^SEE LICEN[CS]E IN (.+)$/;
@@ -10549,7 +10550,7 @@ var require_validate_npm_package_license = __commonJS({
     module.exports = function(argument) {
       var ast;
       try {
-        ast = parse3(argument);
+        ast = parse4(argument);
       } catch (e) {
         var match;
         if (argument === "UNLICENSED" || argument === "UNLICENCED") {
@@ -13903,6 +13904,7 @@ var SERVE_CONTROL_EXT_METHODS = {
   sessionShellHistory: "qwen/control/session/shell_history",
   sessionLanguage: "qwen/control/session/language",
   sessionRewind: "qwen/control/session/rewind",
+  sessionTitle: "qwen/control/session/title",
   workspaceMcpRestart: "qwen/control/workspace/mcp/restart",
   workspaceMcpManage: "qwen/control/workspace/mcp/manage",
   workspaceAgentGenerate: "qwen/control/workspace/agents/generate",
@@ -13911,7 +13913,8 @@ var SERVE_CONTROL_EXT_METHODS = {
   sessionGoalClear: "qwen/control/session/goal/clear",
   workspaceMcpRuntimeAdd: "qwen/control/workspace/mcp/runtime-add",
   workspaceMcpRuntimeRemove: "qwen/control/workspace/mcp/runtime-remove",
-  workspaceReload: "qwen/control/workspace/reload"
+  workspaceReload: "qwen/control/workspace/reload",
+  workspaceExtensionsRefresh: "qwen/control/workspace/extensions/refresh"
 };
 var IDLE_HOOK_EVENTS = {
   PreToolUse: { description: "Before tool execution", matcherKind: "toolName" },
@@ -14111,116 +14114,491 @@ __name(mapDomainErrorToErrorKind, "mapDomainErrorToErrorKind");
 // packages/cli/src/serve/status.ts
 init_esbuild_shims();
 
-// packages/cli/src/utils/languageUtils.ts
+// packages/cli/src/config/trustedFolders.ts
 init_esbuild_shims();
-import * as fs from "node:fs";
+import * as fs3 from "node:fs";
 import * as path2 from "node:path";
-var LLM_OUTPUT_LANGUAGE_RULE_FILENAME = "output-language.md";
-var LLM_OUTPUT_LANGUAGE_MARKER_PREFIX = "qwen-code:llm-output-language:";
-var OUTPUT_LANGUAGE_AUTO = "auto";
-function isAutoLanguage(value) {
-  return !value || value.toLowerCase() === OUTPUT_LANGUAGE_AUTO;
-}
-__name(isAutoLanguage, "isAutoLanguage");
-function normalizeOutputLanguage(language) {
-  const lowered = language.toLowerCase();
-  const fullName = getLanguageNameFromLocale(lowered);
-  if (fullName !== "English" || lowered === "en") {
-    return fullName;
-  }
-  return language;
-}
-__name(normalizeOutputLanguage, "normalizeOutputLanguage");
-function resolveOutputLanguage(value) {
-  if (isAutoLanguage(value)) {
-    const detectedLocale = detectSystemLanguage();
-    return getLanguageNameFromLocale(detectedLocale);
-  }
-  return normalizeOutputLanguage(value);
-}
-__name(resolveOutputLanguage, "resolveOutputLanguage");
-function getOutputLanguageFilePath() {
-  return path2.join(
-    Storage.getGlobalQwenDir(),
-    LLM_OUTPUT_LANGUAGE_RULE_FILENAME
-  );
-}
-__name(getOutputLanguageFilePath, "getOutputLanguageFilePath");
-function sanitizeForMarker(language) {
-  return language.replace(/[\r\n]/g, " ").replace(/--!?>/g, "").replace(/--/g, "");
-}
-__name(sanitizeForMarker, "sanitizeForMarker");
-function generateOutputLanguageFileContent(language) {
-  const safeLanguage = sanitizeForMarker(language);
-  return `# Output language preference: ${language}
-<!-- ${LLM_OUTPUT_LANGUAGE_MARKER_PREFIX} ${safeLanguage} -->
-
-## Rule
-You MUST always respond in **${language}** regardless of the user's input language.
-This is a mandatory requirement, not a preference.
-
-## Exception
-If the user **explicitly** requests a response in a specific language (e.g., "please reply in English", "\u7528\u4E2D\u6587\u56DE\u7B54"), switch to the user's requested language for the remainder of the conversation.
+var import_comment_json2 = __toESM(require_src2(), 1);
+var import_strip_json_comments = __toESM(require_strip_json_comments(), 1);
 
-## Keep technical artifacts unchanged
-Do **not** translate or rewrite:
-- Code blocks, CLI commands, file paths, stack traces, logs, JSON keys, identifiers
-- Exact quoted text from the user (keep quotes verbatim)
+// packages/cli/src/utils/commentJson.ts
+init_esbuild_shims();
+var import_comment_json = __toESM(require_src2(), 1);
+import * as fs2 from "node:fs";
 
-## Tool / system outputs
-Raw tool/system outputs may contain fixed-format English. Preserve them verbatim, and if needed, add a short **${language}** explanation below.
-`;
-}
-__name(generateOutputLanguageFileContent, "generateOutputLanguageFileContent");
-function parseOutputLanguageFromContent(content) {
-  const markerRegex = new RegExp(
-    String.raw`<!--\s*${LLM_OUTPUT_LANGUAGE_MARKER_PREFIX}\s*(.*?)\s*-->`,
-    "i"
-  );
-  const markerMatch = content.match(markerRegex);
-  if (markerMatch?.[1]?.trim()) {
-    return markerMatch[1].trim();
-  }
-  const headingMatch = content.match(
-    /^#.*?CRITICAL:\s*(.*?)\s+Output Language Rule\b/im
-  );
-  if (headingMatch?.[1]?.trim()) {
-    return headingMatch[1].trim();
-  }
-  return null;
-}
-__name(parseOutputLanguageFromContent, "parseOutputLanguageFromContent");
-function readOutputLanguageFromFile() {
-  const filePath = getOutputLanguageFilePath();
-  if (!fs.existsSync(filePath)) {
-    return null;
-  }
+// packages/cli/src/utils/writeWithBackup.ts
+init_esbuild_shims();
+import * as fs from "node:fs";
+function writeWithBackupSync(targetPath, content, options = {}) {
+  const { backupSuffix = ".orig", encoding = "utf-8" } = options;
+  const tempPath = `${targetPath}.tmp`;
+  const backupPath = `${targetPath}${backupSuffix}`;
+  let backupCreated = false;
   try {
-    const content = fs.readFileSync(filePath, "utf-8");
-    return parseOutputLanguageFromContent(content);
-  } catch {
-    return null;
-  }
-}
-__name(readOutputLanguageFromFile, "readOutputLanguageFromFile");
-function writeOutputLanguageFile(language, targetPath) {
-  const filePath = targetPath ?? getOutputLanguageFilePath();
-  const content = generateOutputLanguageFileContent(language);
-  const dir = path2.dirname(filePath);
-  fs.mkdirSync(dir, { recursive: true });
-  fs.writeFileSync(filePath, content, "utf-8");
-}
-__name(writeOutputLanguageFile, "writeOutputLanguageFile");
-function updateOutputLanguageFile(settingValue, targetPath) {
-  const resolved = resolveOutputLanguage(settingValue);
-  writeOutputLanguageFile(resolved, targetPath);
-}
-__name(updateOutputLanguageFile, "updateOutputLanguageFile");
-function writeOutputLanguageAndRegisterPath(settingValue, config) {
-  const targetPath = config?.getOutputLanguageFilePath();
-  updateOutputLanguageFile(settingValue, targetPath);
-  if (!targetPath) {
-    config?.setOutputLanguageFilePath(getOutputLanguageFilePath());
+    if (fs.existsSync(tempPath)) {
+      fs.unlinkSync(tempPath);
+    }
+  } catch (_e) {
+  }
+  try {
+    fs.writeFileSync(tempPath, content, { encoding, flush: true });
+    if (fs.existsSync(targetPath)) {
+      const targetStat = fs.statSync(targetPath);
+      if (targetStat.isDirectory()) {
+        try {
+          fs.unlinkSync(tempPath);
+        } catch (_e) {
+        }
+        throw new Error(
+          `Cannot write to '${targetPath}' because it is a directory`
+        );
+      }
+      try {
+        fs.renameSync(targetPath, backupPath);
+        backupCreated = true;
+      } catch (backupError) {
+        try {
+          fs.unlinkSync(tempPath);
+        } catch (_e) {
+        }
+        throw new Error(
+          `Failed to backup existing file: ${backupError instanceof Error ? backupError.message : String(backupError)}`
+        );
+      }
+    }
+    try {
+      fs.renameSync(tempPath, targetPath);
+      if (backupCreated) {
+        try {
+          fs.unlinkSync(backupPath);
+        } catch (_e) {
+        }
+      }
+    } catch (renameError) {
+      let restoreFailedMessage;
+      let backupExisted = false;
+      if (fs.existsSync(backupPath)) {
+        backupExisted = true;
+        try {
+          fs.renameSync(backupPath, targetPath);
+        } catch (restoreError) {
+          restoreFailedMessage = restoreError instanceof Error ? restoreError.message : String(restoreError);
+        }
+      }
+      const writeFailureMessage = renameError instanceof Error ? renameError.message : String(renameError);
+      if (restoreFailedMessage) {
+        throw new Error(
+          `Failed to write file: ${writeFailureMessage}. Automatic restore failed: ${restoreFailedMessage}. Manual recovery may be required using backup file '${backupPath}'.`
+        );
+      }
+      if (backupExisted) {
+        throw new Error(
+          `Failed to write file: ${writeFailureMessage}. Target was automatically restored from backup '${backupPath}'.`
+        );
+      }
+      throw new Error(
+        `Failed to write file: ${writeFailureMessage}. No backup file was available for restoration.`
+      );
+    }
+  } catch (error) {
+    try {
+      if (fs.existsSync(tempPath)) {
+        fs.unlinkSync(tempPath);
+      }
+    } catch (_e) {
+    }
+    throw error;
+  }
+}
+__name(writeWithBackupSync, "writeWithBackupSync");
+
+// packages/cli/src/utils/commentJson.ts
+function updateSettingsFilePreservingFormat(filePath, updates, sync = false, replacePath = []) {
+  if (!fs2.existsSync(filePath)) {
+    const content = (0, import_comment_json.stringify)(updates, null, 2);
+    writeWithBackupSync(filePath, content);
+    return true;
+  }
+  const originalContent = fs2.readFileSync(filePath, "utf-8");
+  let parsed;
+  try {
+    parsed = (0, import_comment_json.parse)(originalContent);
+  } catch (_error) {
+    writeStderrLine("Error parsing settings file.");
+    writeStderrLine(
+      `Settings file may be corrupted: ${_error instanceof Error ? _error.message : String(_error)}`
+    );
+    return false;
+  }
+  const updatedStructure = applyUpdates(parsed, updates, sync, replacePath);
+  const updatedContent = (0, import_comment_json.stringify)(updatedStructure, null, 2);
+  try {
+    (0, import_comment_json.parse)(updatedContent);
+  } catch (validationError) {
+    writeStderrLine(
+      "Error: Refusing to write settings file \u2014 the result would not be valid JSON."
+    );
+    writeStderrLine(
+      validationError instanceof Error ? validationError.message : String(validationError)
+    );
+    return false;
+  }
+  writeWithBackupSync(filePath, updatedContent);
+  return true;
+}
+__name(updateSettingsFilePreservingFormat, "updateSettingsFilePreservingFormat");
+function applyUpdates(current, updates, sync = false, replacePath = [], currentPath = []) {
+  const result = current;
+  if (sync) {
+    const keysToRemove = Object.keys(result).filter((key) => !(key in updates));
+    for (const key of keysToRemove) {
+      delete result[key];
+    }
+  }
+  for (const key of Object.getOwnPropertyNames(updates)) {
+    if (key === "__proto__" || key === "constructor" || key === "prototype") {
+      continue;
+    }
+    const value = updates[key];
+    const nextPath = [...currentPath, key];
+    const valueIsObject = typeof value === "object" && value !== null && !Array.isArray(value) && Object.keys(value).length > 0;
+    if (pathsEqual(nextPath, replacePath)) {
+      result[key] = valueIsObject ? applyUpdates({}, value) : value;
+      continue;
+    }
+    if (valueIsObject && (typeof result[key] !== "object" || result[key] === null || Array.isArray(result[key]))) {
+      result[key] = applyUpdates(
+        {},
+        value,
+        sync,
+        replacePath,
+        nextPath
+      );
+    } else if (valueIsObject && typeof result[key] === "object" && result[key] !== null && !Array.isArray(result[key])) {
+      result[key] = applyUpdates(
+        result[key],
+        value,
+        sync,
+        replacePath,
+        nextPath
+      );
+    } else {
+      result[key] = value;
+    }
+  }
+  return result;
+}
+__name(applyUpdates, "applyUpdates");
+function pathsEqual(left, right) {
+  return left.length === right.length && left.every((segment, index) => segment === right[index]);
+}
+__name(pathsEqual, "pathsEqual");
+
+// packages/cli/src/config/trustedFolders.ts
+var TRUSTED_FOLDERS_FILENAME = "trustedFolders.json";
+function getTrustedFoldersPath() {
+  if (process.env["QWEN_CODE_TRUSTED_FOLDERS_PATH"]) {
+    return process.env["QWEN_CODE_TRUSTED_FOLDERS_PATH"];
+  }
+  return path2.join(Storage.getGlobalQwenDir(), TRUSTED_FOLDERS_FILENAME);
+}
+__name(getTrustedFoldersPath, "getTrustedFoldersPath");
+var LoadedTrustedFolders = class {
+  constructor(user, errors) {
+    this.user = user;
+    this.errors = errors;
+  }
+  static {
+    __name(this, "LoadedTrustedFolders");
+  }
+  get rules() {
+    return Object.entries(this.user.config).map(([path9, trustLevel]) => ({
+      path: path9,
+      trustLevel
+    }));
+  }
+  /**
+   * Returns true or false if the path should be "trusted". This function
+   * should only be invoked when the folder trust setting is active.
+   *
+   * @param location path
+   * @returns
+   */
+  isPathTrusted(location) {
+    const trustedPaths = [];
+    const untrustedPaths = [];
+    for (const rule of this.rules) {
+      switch (rule.trustLevel) {
+        case "TRUST_FOLDER" /* TRUST_FOLDER */:
+          trustedPaths.push(rule.path);
+          break;
+        case "TRUST_PARENT" /* TRUST_PARENT */:
+          trustedPaths.push(path2.dirname(rule.path));
+          break;
+        case "DO_NOT_TRUST" /* DO_NOT_TRUST */:
+          untrustedPaths.push(rule.path);
+          break;
+        default:
+          break;
+      }
+    }
+    for (const trustedPath of trustedPaths) {
+      if (isWithinRoot(location, trustedPath)) {
+        return true;
+      }
+    }
+    for (const untrustedPath of untrustedPaths) {
+      if (path2.normalize(location) === path2.normalize(untrustedPath)) {
+        return false;
+      }
+    }
+    return void 0;
+  }
+  setValue(path9, trustLevel) {
+    this.user.config[path9] = trustLevel;
+    saveTrustedFolders(this.user);
+  }
+};
+var loadedTrustedFolders;
+function loadTrustedFolders() {
+  if (loadedTrustedFolders) {
+    return loadedTrustedFolders;
+  }
+  const errors = [];
+  let userConfig = {};
+  const userPath = getTrustedFoldersPath();
+  try {
+    if (fs3.existsSync(userPath)) {
+      const content = fs3.readFileSync(userPath, "utf-8");
+      const parsed = JSON.parse((0, import_strip_json_comments.default)(content));
+      if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) {
+        errors.push({
+          message: "Trusted folders file is not a valid JSON object.",
+          path: userPath
+        });
+      } else {
+        userConfig = parsed;
+      }
+    }
+  } catch (error) {
+    errors.push({
+      message: getErrorMessage(error),
+      path: userPath
+    });
+  }
+  loadedTrustedFolders = new LoadedTrustedFolders(
+    { path: userPath, config: userConfig },
+    errors
+  );
+  return loadedTrustedFolders;
+}
+__name(loadTrustedFolders, "loadTrustedFolders");
+function saveTrustedFolders(trustedFoldersFile) {
+  try {
+    const dirPath = path2.dirname(trustedFoldersFile.path);
+    if (!fs3.existsSync(dirPath)) {
+      fs3.mkdirSync(dirPath, { recursive: true });
+    }
+    let content = (0, import_comment_json2.stringify)(trustedFoldersFile.config, null, 2);
+    if (fs3.existsSync(trustedFoldersFile.path)) {
+      try {
+        const originalContent = fs3.readFileSync(
+          trustedFoldersFile.path,
+          "utf-8"
+        );
+        const parsed = (0, import_comment_json2.parse)(originalContent);
+        if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed) || parsed instanceof String || parsed instanceof Number || parsed instanceof Boolean) {
+          throw new Error("trusted folders file is not a JSON object");
+        }
+        const updated = applyUpdates(
+          parsed,
+          trustedFoldersFile.config,
+          true
+        );
+        const preservedContent = (0, import_comment_json2.stringify)(updated, null, 2);
+        (0, import_comment_json2.parse)(preservedContent);
+        content = preservedContent;
+      } catch (error) {
+        writeStderrLine(
+          `Falling back to clean rewrite for trusted folders: ${error instanceof Error ? error.message : String(error)}`
+        );
+      }
+    }
+    atomicWriteFileSync(
+      trustedFoldersFile.path,
+      content,
+      // noFollow: refuse to follow any pre-placed symlink at the
+      // config path — a redirected write could either leak the
+      // trusted-folder list to an attacker target or leave the user's
+      // real config silently stale. Matches the credential write
+      // sites' security posture (sharedTokenManager, oauth-token-storage,
+      // file-token-storage all use noFollow:true).
+      { encoding: "utf-8", mode: 384, forceMode: true, noFollow: true }
+    );
+  } catch (error) {
+    writeStderrLine("Error saving trusted folders file.");
+    writeStderrLine(error instanceof Error ? error.message : String(error));
+  }
+}
+__name(saveTrustedFolders, "saveTrustedFolders");
+function isFolderTrustEnabled(settings) {
+  const folderTrustSetting = settings.security?.folderTrust?.enabled ?? false;
+  return folderTrustSetting;
+}
+__name(isFolderTrustEnabled, "isFolderTrustEnabled");
+function getWorkspaceTrustFromLocalConfig(trustConfig) {
+  const folders = loadTrustedFolders();
+  if (trustConfig) {
+    folders.user.config = trustConfig;
+  }
+  if (folders.errors.length > 0) {
+    const errorMessages = folders.errors.map(
+      (error) => `Error in ${error.path}: ${error.message}`
+    );
+    throw new FatalConfigError(
+      `${errorMessages.join("\n")}
+Please fix the configuration file and try again.`
+    );
+  }
+  const isTrusted = folders.isPathTrusted(process.cwd());
+  return {
+    isTrusted,
+    source: isTrusted !== void 0 ? "file" : void 0
+  };
+}
+__name(getWorkspaceTrustFromLocalConfig, "getWorkspaceTrustFromLocalConfig");
+function isWorkspaceTrusted(settings, trustConfig) {
+  if (!isFolderTrustEnabled(settings)) {
+    return { isTrusted: true, source: void 0 };
+  }
+  const ideTrust = ideContextStore.get()?.workspaceState?.isTrusted;
+  if (ideTrust !== void 0) {
+    return { isTrusted: ideTrust, source: "ide" };
+  }
+  return getWorkspaceTrustFromLocalConfig(trustConfig);
+}
+__name(isWorkspaceTrusted, "isWorkspaceTrusted");
+
+// packages/cli/src/utils/languageUtils.ts
+init_esbuild_shims();
+import * as fs4 from "node:fs";
+import * as path3 from "node:path";
+var LLM_OUTPUT_LANGUAGE_RULE_FILENAME = "output-language.md";
+var LLM_OUTPUT_LANGUAGE_MARKER_PREFIX = "qwen-code:llm-output-language:";
+var OUTPUT_LANGUAGE_AUTO = "auto";
+function isAutoLanguage(value) {
+  return !value || value.toLowerCase() === OUTPUT_LANGUAGE_AUTO;
+}
+__name(isAutoLanguage, "isAutoLanguage");
+function normalizeOutputLanguage(language) {
+  const normalized = language.trim().replace(/_/g, "-").toLowerCase();
+  const knownLanguageName = SUPPORTED_LANGUAGES.find(
+    (supportedLanguage) => supportedLanguage.fullName.toLowerCase() === normalized
+  );
+  if (knownLanguageName) {
+    return knownLanguageName.fullName;
+  }
+  const knownLocaleCode = SUPPORTED_LANGUAGES.some((supportedLanguage) => {
+    const code = supportedLanguage.code.toLowerCase();
+    const id = supportedLanguage.id.toLowerCase();
+    return normalized === code || normalized === id || normalized.startsWith(`${code}-`) || normalized.startsWith(`${id}-`) || normalized.startsWith(`${code}.`) || normalized.startsWith(`${id}.`) || normalized.startsWith(`${code}@`) || normalized.startsWith(`${id}@`);
+  });
+  if (!knownLocaleCode) {
+    return language;
+  }
+  return getLanguageNameFromLocale(normalized);
+}
+__name(normalizeOutputLanguage, "normalizeOutputLanguage");
+function resolveOutputLanguage(value) {
+  if (isAutoLanguage(value)) {
+    const detectedLocale = detectSystemLanguage();
+    return getLanguageNameFromLocale(detectedLocale);
+  }
+  return normalizeOutputLanguage(value);
+}
+__name(resolveOutputLanguage, "resolveOutputLanguage");
+function getOutputLanguageFilePath() {
+  return path3.join(
+    Storage.getGlobalQwenDir(),
+    LLM_OUTPUT_LANGUAGE_RULE_FILENAME
+  );
+}
+__name(getOutputLanguageFilePath, "getOutputLanguageFilePath");
+function sanitizeForMarker(language) {
+  return language.replace(/[\r\n]/g, " ").replace(/--!?>/g, "").replace(/--/g, "");
+}
+__name(sanitizeForMarker, "sanitizeForMarker");
+function generateOutputLanguageFileContent(language) {
+  const safeLanguage = sanitizeForMarker(language);
+  return `# Output language preference: ${language}
+<!-- ${LLM_OUTPUT_LANGUAGE_MARKER_PREFIX} ${safeLanguage} -->
+
+## Rule
+You MUST always respond in **${language}** regardless of the user's input language.
+This is a mandatory requirement, not a preference.
+
+## Exception
+If the user **explicitly** requests a response in a specific language (e.g., "please reply in English", "\u7528\u4E2D\u6587\u56DE\u7B54"), switch to the user's requested language for the remainder of the conversation.
+
+## Keep technical artifacts unchanged
+Do **not** translate or rewrite:
+- Code blocks, CLI commands, file paths, stack traces, logs, JSON keys, identifiers
+- Exact quoted text from the user (keep quotes verbatim)
+
+## Tool / system outputs
+Raw tool/system outputs may contain fixed-format English. Preserve them verbatim, and if needed, add a short **${language}** explanation below.
+`;
+}
+__name(generateOutputLanguageFileContent, "generateOutputLanguageFileContent");
+function parseOutputLanguageFromContent(content) {
+  const markerRegex = new RegExp(
+    String.raw`<!--\s*${LLM_OUTPUT_LANGUAGE_MARKER_PREFIX}\s*(.*?)\s*-->`,
+    "i"
+  );
+  const markerMatch = content.match(markerRegex);
+  if (markerMatch?.[1]?.trim()) {
+    return markerMatch[1].trim();
+  }
+  const headingMatch = content.match(
+    /^#.*?CRITICAL:\s*(.*?)\s+Output Language Rule\b/im
+  );
+  if (headingMatch?.[1]?.trim()) {
+    return headingMatch[1].trim();
+  }
+  return null;
+}
+__name(parseOutputLanguageFromContent, "parseOutputLanguageFromContent");
+function readOutputLanguageFromFile() {
+  const filePath = getOutputLanguageFilePath();
+  if (!fs4.existsSync(filePath)) {
+    return null;
+  }
+  try {
+    const content = fs4.readFileSync(filePath, "utf-8");
+    return parseOutputLanguageFromContent(content);
+  } catch {
+    return null;
+  }
+}
+__name(readOutputLanguageFromFile, "readOutputLanguageFromFile");
+function writeOutputLanguageFile(language, targetPath) {
+  const filePath = targetPath ?? getOutputLanguageFilePath();
+  const content = generateOutputLanguageFileContent(language);
+  const dir = path3.dirname(filePath);
+  fs4.mkdirSync(dir, { recursive: true });
+  fs4.writeFileSync(filePath, content, "utf-8");
+}
+__name(writeOutputLanguageFile, "writeOutputLanguageFile");
+function updateOutputLanguageFile(settingValue, targetPath) {
+  const resolved = resolveOutputLanguage(settingValue);
+  writeOutputLanguageFile(resolved, targetPath);
+}
+__name(updateOutputLanguageFile, "updateOutputLanguageFile");
+function writeOutputLanguageAndRegisterPath(settingValue, config) {
+  const targetPath = config?.getOutputLanguageFilePath();
+  updateOutputLanguageFile(settingValue, targetPath);
+  if (!targetPath) {
+    config?.setOutputLanguageFilePath(getOutputLanguageFilePath());
   }
 }
 __name(writeOutputLanguageAndRegisterPath, "writeOutputLanguageAndRegisterPath");
@@ -15104,194 +15482,30 @@ var DefaultDark = new Theme(
       color: darkTheme.AccentYellow
     },
     "hljs-selector-id": {
-      color: darkTheme.AccentYellow
-    },
-    "hljs-selector-class": {
-      color: darkTheme.AccentYellow
-    },
-    "hljs-selector-attr": {
-      color: darkTheme.AccentYellow
-    },
-    "hljs-selector-pseudo": {
-      color: darkTheme.AccentYellow
-    },
-    "hljs-addition": {
-      backgroundColor: "#144212",
-      display: "inline-block",
-      width: "100%"
-    },
-    "hljs-deletion": {
-      backgroundColor: "#600",
-      display: "inline-block",
-      width: "100%"
-    }
-  },
-  darkTheme
-);
-
-// packages/cli/src/config/trustedFolders.ts
-init_esbuild_shims();
-import * as fs2 from "node:fs";
-import * as path3 from "node:path";
-var import_strip_json_comments = __toESM(require_strip_json_comments(), 1);
-var TRUSTED_FOLDERS_FILENAME = "trustedFolders.json";
-function getTrustedFoldersPath() {
-  if (process.env["QWEN_CODE_TRUSTED_FOLDERS_PATH"]) {
-    return process.env["QWEN_CODE_TRUSTED_FOLDERS_PATH"];
-  }
-  return path3.join(Storage.getGlobalQwenDir(), TRUSTED_FOLDERS_FILENAME);
-}
-__name(getTrustedFoldersPath, "getTrustedFoldersPath");
-var LoadedTrustedFolders = class {
-  constructor(user, errors) {
-    this.user = user;
-    this.errors = errors;
-  }
-  static {
-    __name(this, "LoadedTrustedFolders");
-  }
-  get rules() {
-    return Object.entries(this.user.config).map(([path9, trustLevel]) => ({
-      path: path9,
-      trustLevel
-    }));
-  }
-  /**
-   * Returns true or false if the path should be "trusted". This function
-   * should only be invoked when the folder trust setting is active.
-   *
-   * @param location path
-   * @returns
-   */
-  isPathTrusted(location) {
-    const trustedPaths = [];
-    const untrustedPaths = [];
-    for (const rule of this.rules) {
-      switch (rule.trustLevel) {
-        case "TRUST_FOLDER" /* TRUST_FOLDER */:
-          trustedPaths.push(rule.path);
-          break;
-        case "TRUST_PARENT" /* TRUST_PARENT */:
-          trustedPaths.push(path3.dirname(rule.path));
-          break;
-        case "DO_NOT_TRUST" /* DO_NOT_TRUST */:
-          untrustedPaths.push(rule.path);
-          break;
-        default:
-          break;
-      }
-    }
-    for (const trustedPath of trustedPaths) {
-      if (isWithinRoot(location, trustedPath)) {
-        return true;
-      }
-    }
-    for (const untrustedPath of untrustedPaths) {
-      if (path3.normalize(location) === path3.normalize(untrustedPath)) {
-        return false;
-      }
-    }
-    return void 0;
-  }
-  setValue(path9, trustLevel) {
-    this.user.config[path9] = trustLevel;
-    saveTrustedFolders(this.user);
-  }
-};
-var loadedTrustedFolders;
-function loadTrustedFolders() {
-  if (loadedTrustedFolders) {
-    return loadedTrustedFolders;
-  }
-  const errors = [];
-  let userConfig = {};
-  const userPath = getTrustedFoldersPath();
-  try {
-    if (fs2.existsSync(userPath)) {
-      const content = fs2.readFileSync(userPath, "utf-8");
-      const parsed = JSON.parse((0, import_strip_json_comments.default)(content));
-      if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) {
-        errors.push({
-          message: "Trusted folders file is not a valid JSON object.",
-          path: userPath
-        });
-      } else {
-        userConfig = parsed;
-      }
-    }
-  } catch (error) {
-    errors.push({
-      message: getErrorMessage(error),
-      path: userPath
-    });
-  }
-  loadedTrustedFolders = new LoadedTrustedFolders(
-    { path: userPath, config: userConfig },
-    errors
-  );
-  return loadedTrustedFolders;
-}
-__name(loadTrustedFolders, "loadTrustedFolders");
-function saveTrustedFolders(trustedFoldersFile) {
-  try {
-    const dirPath = path3.dirname(trustedFoldersFile.path);
-    if (!fs2.existsSync(dirPath)) {
-      fs2.mkdirSync(dirPath, { recursive: true });
-    }
-    atomicWriteFileSync(
-      trustedFoldersFile.path,
-      JSON.stringify(trustedFoldersFile.config, null, 2),
-      // noFollow: refuse to follow any pre-placed symlink at the
-      // config path — a redirected write could either leak the
-      // trusted-folder list to an attacker target or leave the user's
-      // real config silently stale. Matches the credential write
-      // sites' security posture (sharedTokenManager, oauth-token-storage,
-      // file-token-storage all use noFollow:true).
-      { encoding: "utf-8", mode: 384, forceMode: true, noFollow: true }
-    );
-  } catch (error) {
-    writeStderrLine("Error saving trusted folders file.");
-    writeStderrLine(error instanceof Error ? error.message : String(error));
-  }
-}
-__name(saveTrustedFolders, "saveTrustedFolders");
-function isFolderTrustEnabled(settings) {
-  const folderTrustSetting = settings.security?.folderTrust?.enabled ?? false;
-  return folderTrustSetting;
-}
-__name(isFolderTrustEnabled, "isFolderTrustEnabled");
-function getWorkspaceTrustFromLocalConfig(trustConfig) {
-  const folders = loadTrustedFolders();
-  if (trustConfig) {
-    folders.user.config = trustConfig;
-  }
-  if (folders.errors.length > 0) {
-    const errorMessages = folders.errors.map(
-      (error) => `Error in ${error.path}: ${error.message}`
-    );
-    throw new FatalConfigError(
-      `${errorMessages.join("\n")}
-Please fix the configuration file and try again.`
-    );
-  }
-  const isTrusted = folders.isPathTrusted(process.cwd());
-  return {
-    isTrusted,
-    source: isTrusted !== void 0 ? "file" : void 0
-  };
-}
-__name(getWorkspaceTrustFromLocalConfig, "getWorkspaceTrustFromLocalConfig");
-function isWorkspaceTrusted(settings, trustConfig) {
-  if (!isFolderTrustEnabled(settings)) {
-    return { isTrusted: true, source: void 0 };
-  }
-  const ideTrust = ideContextStore.get()?.workspaceState?.isTrusted;
-  if (ideTrust !== void 0) {
-    return { isTrusted: ideTrust, source: "ide" };
-  }
-  return getWorkspaceTrustFromLocalConfig(trustConfig);
-}
-__name(isWorkspaceTrusted, "isWorkspaceTrusted");
+      color: darkTheme.AccentYellow
+    },
+    "hljs-selector-class": {
+      color: darkTheme.AccentYellow
+    },
+    "hljs-selector-attr": {
+      color: darkTheme.AccentYellow
+    },
+    "hljs-selector-pseudo": {
+      color: darkTheme.AccentYellow
+    },
+    "hljs-addition": {
+      backgroundColor: "#144212",
+      display: "inline-block",
+      width: "100%"
+    },
+    "hljs-deletion": {
+      backgroundColor: "#600",
+      display: "inline-block",
+      width: "100%"
+    }
+  },
+  darkTheme
+);
 
 // packages/cli/src/config/modelProvidersScope.ts
 init_esbuild_shims();
@@ -15783,9 +15997,9 @@ var SETTINGS_SCHEMA = {
         label: "Show Status in Title",
         category: "UI",
         requiresRestart: false,
-        default: false,
-        description: "Show Qwen Code status and thoughts in the terminal window title",
-        showInDialog: false
+        default: true,
+        description: "Show Qwen Code session name and status in the terminal window title",
+        showInDialog: true
       },
       hideTips: {
         type: "boolean",
@@ -15796,6 +16010,26 @@ var SETTINGS_SCHEMA = {
         description: "Hide helpful tips in the UI",
         showInDialog: true
       },
+      history: {
+        type: "object",
+        label: "History",
+        category: "UI",
+        requiresRestart: false,
+        default: {},
+        description: "History display settings.",
+        showInDialog: false,
+        properties: {
+          collapseOnResume: {
+            type: "boolean",
+            label: "Collapse On Resume",
+            category: "UI",
+            requiresRestart: false,
+            default: false,
+            description: "Whether to collapse history by default when resuming a session.",
+            showInDialog: false
+          }
+        }
+      },
       showLineNumbers: {
         type: "boolean",
         label: "Show Line Numbers in Code",
@@ -15836,6 +16070,15 @@ var SETTINGS_SCHEMA = {
         description: "Custom witty phrases to display during loading.",
         showInDialog: false
       },
+      showResponseTokensPerSecond: {
+        type: "boolean",
+        label: "Show Response Tokens Per Second",
+        category: "UI",
+        requiresRestart: true,
+        default: false,
+        description: "Show a live tokens/sec estimate next to the response token counter while the model is streaming. Takes effect in the next session.",
+        showInDialog: true
+      },
       enableWelcomeBack: {
         type: "boolean",
         label: "Show Welcome Back Dialog",
@@ -15859,8 +16102,8 @@ var SETTINGS_SCHEMA = {
         label: "Enable Follow-up Suggestions",
         category: "UI",
         requiresRestart: false,
-        default: false,
-        description: "Show context-aware follow-up suggestions after task completion. Press Tab or Right Arrow to accept, Enter to accept and submit.",
+        default: true,
+        description: "Show context-aware follow-up suggestions after task completion. Press Tab, Right Arrow, or Enter to accept into the input buffer.",
         showInDialog: true
       },
       enableCacheSharing: {
@@ -16179,6 +16422,15 @@ var SETTINGS_SCHEMA = {
         description: "The model to use for conversations.",
         showInDialog: false
       },
+      baseUrl: {
+        type: "string",
+        label: "Model Base URL",
+        category: "Model",
+        requiresRestart: false,
+        default: void 0,
+        description: "Base URL paired with model.name; disambiguates which provider to use when multiple modelProviders entries share the same model id.",
+        showInDialog: false
+      },
       maxSessionTurns: {
         type: "number",
         label: "Max Session Turns",
@@ -16233,6 +16485,15 @@ var SETTINGS_SCHEMA = {
         description: "Skip the next speaker check.",
         showInDialog: false
       },
+      skipWorkflowUsageWarning: {
+        type: "boolean",
+        label: "Skip Workflow Usage Warning",
+        category: "Model",
+        requiresRestart: false,
+        default: false,
+        description: "Suppress the one-time Workflow tool usage banner that describes the QWEN_CODE_MAX_TOKENS_PER_WORKFLOW env knob. The banner fires at most once per session regardless of this setting.",
+        showInDialog: false
+      },
       skipLoopDetection: {
         type: "boolean",
         label: "Skip Loop Detection",
@@ -16318,6 +16579,20 @@ var SETTINGS_SCHEMA = {
             parentKey: "generationConfig",
             showInDialog: false
           },
+          toolResultContentFormat: {
+            type: "enum",
+            label: "Tool Result Content Format",
+            category: "Generation Configuration",
+            requiresRestart: false,
+            default: "parts",
+            description: 'Controls how text-only tool results are serialized in OpenAI-compatible requests. Use "parts" for the default content-part array shape. Use "string" only for legacy OpenAI-compatible runtimes whose tool templates ignore text content parts (for example older GLM-5.1 vLLM/SGLang templates; QwenLM/qwen-code#3361). Tool-returned media is still handled by splitToolMedia.',
+            parentKey: "generationConfig",
+            showInDialog: false,
+            options: [
+              { value: "parts", label: "Content Parts (Default)" },
+              { value: "string", label: "String" }
+            ]
+          },
           schemaCompliance: {
             type: "enum",
             label: "Tool Schema Compliance",
@@ -16370,17 +16645,27 @@ var SETTINGS_SCHEMA = {
         category: "Context",
         requiresRestart: false,
         default: void 0,
-        description: "The name of the context file.",
-        showInDialog: false
+        description: "The name of the context file or files.",
+        showInDialog: false,
+        jsonSchemaOverride: {
+          anyOf: [
+            { type: "string" },
+            { type: "array", items: { type: "string" } }
+          ]
+        }
       },
       importFormat: {
-        type: "string",
+        type: "enum",
         label: "Memory Import Format",
         category: "Context",
         requiresRestart: false,
         default: void 0,
         description: "The format to use when importing memory.",
-        showInDialog: false
+        showInDialog: false,
+        options: [
+          { value: "tree", label: "Tree" },
+          { value: "flat", label: "Flat" }
+        ]
       },
       includeDirectories: {
         type: "array",
@@ -16757,7 +17042,10 @@ var SETTINGS_SCHEMA = {
         requiresRestart: true,
         default: void 0,
         description: "Sandbox execution environment (can be a boolean or a path string).",
-        showInDialog: false
+        showInDialog: false,
+        jsonSchemaOverride: {
+          anyOf: [{ type: "boolean" }, { type: "string" }]
+        }
       },
       sandboxImage: {
         type: "string",
@@ -17189,13 +17477,17 @@ var SETTINGS_SCHEMA = {
         showInDialog: false
       },
       dnsResolutionOrder: {
-        type: "string",
+        type: "enum",
         label: "DNS Resolution Order",
         category: "Advanced",
         requiresRestart: true,
         default: void 0,
         description: "The DNS resolution order.",
-        showInDialog: false
+        showInDialog: false,
+        options: [
+          { value: "ipv4first", label: "IPv4 First" },
+          { value: "verbatim", label: "Verbatim" }
+        ]
       },
       excludedEnvVars: {
         type: "array",
@@ -17633,7 +17925,7 @@ __name(resolveEnvVarsInObjectInternal, "resolveEnvVarsInObjectInternal");
 
 // packages/cli/src/utils/settingsUtils.ts
 init_esbuild_shims();
-import * as fs3 from "node:fs";
+import * as fs5 from "node:fs";
 function flattenSchema(schema, prefix = "") {
   let result = {};
   for (const key in schema) {
@@ -17887,9 +18179,9 @@ function isDefaultValue(key, settings) {
 __name(isDefaultValue, "isDefaultValue");
 function backupSettingsFile(filePath) {
   try {
-    if (fs3.existsSync(filePath)) {
+    if (fs5.existsSync(filePath)) {
       const backupPath = `${filePath}.orig`;
-      fs3.copyFileSync(filePath, backupPath);
+      fs5.copyFileSync(filePath, backupPath);
       return true;
     }
   } catch (_e) {
@@ -17900,9 +18192,9 @@ __name(backupSettingsFile, "backupSettingsFile");
 function restoreSettingsFromBackup(filePath) {
   try {
     const backupPath = `${filePath}.orig`;
-    if (fs3.existsSync(backupPath)) {
-      fs3.copyFileSync(backupPath, filePath);
-      fs3.unlinkSync(backupPath);
+    if (fs5.existsSync(backupPath)) {
+      fs5.copyFileSync(backupPath, filePath);
+      fs5.unlinkSync(backupPath);
       return true;
     }
   } catch (err) {
@@ -17917,8 +18209,8 @@ __name(restoreSettingsFromBackup, "restoreSettingsFromBackup");
 function cleanupSettingsBackup(filePath) {
   try {
     const backupPath = `${filePath}.orig`;
-    if (fs3.existsSync(backupPath)) {
-      fs3.unlinkSync(backupPath);
+    if (fs5.existsSync(backupPath)) {
+      fs5.unlinkSync(backupPath);
     }
   } catch (_e) {
   }
@@ -17985,171 +18277,6 @@ function customDeepMerge(getMergeStrategyForPath2, ...sources) {
 }
 __name(customDeepMerge, "customDeepMerge");
 
-// packages/cli/src/utils/commentJson.ts
-init_esbuild_shims();
-var import_comment_json = __toESM(require_src2(), 1);
-import * as fs5 from "node:fs";
-
-// packages/cli/src/utils/writeWithBackup.ts
-init_esbuild_shims();
-import * as fs4 from "node:fs";
-function writeWithBackupSync(targetPath, content, options = {}) {
-  const { backupSuffix = ".orig", encoding = "utf-8" } = options;
-  const tempPath = `${targetPath}.tmp`;
-  const backupPath = `${targetPath}${backupSuffix}`;
-  try {
-    if (fs4.existsSync(tempPath)) {
-      fs4.unlinkSync(tempPath);
-    }
-  } catch (_e) {
-  }
-  try {
-    fs4.writeFileSync(tempPath, content, { encoding, flush: true });
-    if (fs4.existsSync(targetPath)) {
-      const targetStat = fs4.statSync(targetPath);
-      if (targetStat.isDirectory()) {
-        try {
-          fs4.unlinkSync(tempPath);
-        } catch (_e) {
-        }
-        throw new Error(
-          `Cannot write to '${targetPath}' because it is a directory`
-        );
-      }
-      try {
-        fs4.renameSync(targetPath, backupPath);
-      } catch (backupError) {
-        try {
-          fs4.unlinkSync(tempPath);
-        } catch (_e) {
-        }
-        throw new Error(
-          `Failed to backup existing file: ${backupError instanceof Error ? backupError.message : String(backupError)}`
-        );
-      }
-    }
-    try {
-      fs4.renameSync(tempPath, targetPath);
-    } catch (renameError) {
-      let restoreFailedMessage;
-      let backupExisted = false;
-      if (fs4.existsSync(backupPath)) {
-        backupExisted = true;
-        try {
-          fs4.renameSync(backupPath, targetPath);
-        } catch (restoreError) {
-          restoreFailedMessage = restoreError instanceof Error ? restoreError.message : String(restoreError);
-        }
-      }
-      const writeFailureMessage = renameError instanceof Error ? renameError.message : String(renameError);
-      if (restoreFailedMessage) {
-        throw new Error(
-          `Failed to write file: ${writeFailureMessage}. Automatic restore failed: ${restoreFailedMessage}. Manual recovery may be required using backup file '${backupPath}'.`
-        );
-      }
-      if (backupExisted) {
-        throw new Error(
-          `Failed to write file: ${writeFailureMessage}. Target was automatically restored from backup '${backupPath}'.`
-        );
-      }
-      throw new Error(
-        `Failed to write file: ${writeFailureMessage}. No backup file was available for restoration.`
-      );
-    }
-  } catch (error) {
-    try {
-      if (fs4.existsSync(tempPath)) {
-        fs4.unlinkSync(tempPath);
-      }
-    } catch (_e) {
-    }
-    throw error;
-  }
-}
-__name(writeWithBackupSync, "writeWithBackupSync");
-
-// packages/cli/src/utils/commentJson.ts
-function updateSettingsFilePreservingFormat(filePath, updates, sync = false, replacePath = []) {
-  if (!fs5.existsSync(filePath)) {
-    const content = (0, import_comment_json.stringify)(updates, null, 2);
-    writeWithBackupSync(filePath, content);
-    return true;
-  }
-  const originalContent = fs5.readFileSync(filePath, "utf-8");
-  let parsed;
-  try {
-    parsed = (0, import_comment_json.parse)(originalContent);
-  } catch (_error) {
-    writeStderrLine("Error parsing settings file.");
-    writeStderrLine(
-      `Settings file may be corrupted: ${_error instanceof Error ? _error.message : String(_error)}`
-    );
-    return false;
-  }
-  const updatedStructure = applyUpdates(parsed, updates, sync, replacePath);
-  const updatedContent = (0, import_comment_json.stringify)(updatedStructure, null, 2);
-  try {
-    (0, import_comment_json.parse)(updatedContent);
-  } catch (validationError) {
-    writeStderrLine(
-      "Error: Refusing to write settings file \u2014 the result would not be valid JSON."
-    );
-    writeStderrLine(
-      validationError instanceof Error ? validationError.message : String(validationError)
-    );
-    return false;
-  }
-  writeWithBackupSync(filePath, updatedContent);
-  return true;
-}
-__name(updateSettingsFilePreservingFormat, "updateSettingsFilePreservingFormat");
-function applyUpdates(current, updates, sync = false, replacePath = [], currentPath = []) {
-  const result = current;
-  if (sync) {
-    const keysToRemove = Object.keys(result).filter((key) => !(key in updates));
-    for (const key of keysToRemove) {
-      delete result[key];
-    }
-  }
-  for (const key of Object.getOwnPropertyNames(updates)) {
-    if (key === "__proto__" || key === "constructor" || key === "prototype") {
-      continue;
-    }
-    const value = updates[key];
-    const nextPath = [...currentPath, key];
-    const valueIsObject = typeof value === "object" && value !== null && !Array.isArray(value) && Object.keys(value).length > 0;
-    if (pathsEqual(nextPath, replacePath)) {
-      result[key] = valueIsObject ? applyUpdates({}, value) : value;
-      continue;
-    }
-    if (valueIsObject && (typeof result[key] !== "object" || result[key] === null || Array.isArray(result[key]))) {
-      result[key] = applyUpdates(
-        {},
-        value,
-        sync,
-        replacePath,
-        nextPath
-      );
-    } else if (valueIsObject && typeof result[key] === "object" && result[key] !== null && !Array.isArray(result[key])) {
-      result[key] = applyUpdates(
-        result[key],
-        value,
-        sync,
-        replacePath,
-        nextPath
-      );
-    } else {
-      result[key] = value;
-    }
-  }
-  return result;
-}
-__name(applyUpdates, "applyUpdates");
-function pathsEqual(left, right) {
-  return left.length === right.length && left.every((segment, index) => segment === right[index]);
-}
-__name(pathsEqual, "pathsEqual");
-
 // packages/cli/src/config/migration/index.ts
 init_esbuild_shims();
 
@@ -18996,7 +19123,7 @@ var LoadedSettings = class {
   static {
     __name(this, "LoadedSettings");
   }
-  constructor(system, systemDefaults, user, workspace, isTrusted, migratedInMemorScopes, migrationWarnings = [], corruptedPath = void 0, wasRecovered = false) {
+  constructor(system, systemDefaults, user, workspace, isTrusted, migratedInMemorScopes, migrationWarnings = [], corruptedPath = void 0, wasRecovered = false, workspaceSettingsActive = true) {
     this.system = system;
     this.systemDefaults = systemDefaults;
     this.user = user;
@@ -19006,6 +19133,7 @@ var LoadedSettings = class {
     this.migrationWarnings = migrationWarnings;
     this.corruptedPath = corruptedPath;
     this.wasRecovered = wasRecovered;
+    this.workspaceSettingsActive = workspaceSettingsActive;
     this._merged = this.computeMergedSettings();
   }
   system;
@@ -19017,6 +19145,7 @@ var LoadedSettings = class {
   migrationWarnings;
   corruptedPath;
   wasRecovered;
+  workspaceSettingsActive;
   corruptionDialogDismissed = false;
   _merged;
   get merged() {
@@ -19461,15 +19590,17 @@ function loadSettings(workspaceDir = process2.cwd(), consumeCorruptionEnvVars =
   const loadAndMigrate = /* @__PURE__ */ __name((filePath, scope) => {
     try {
       if (fs6.existsSync(filePath)) {
-        let content = fs6.readFileSync(filePath, "utf-8");
+        const content = fs6.readFileSync(filePath, "utf-8");
         let rawSettings;
         const corruptedPath = `${filePath}${CORRUPTED_SUFFIX}`;
         let corruptedSaved = false;
-        let recoveredFromBackup = false;
         let recoveredFromEnvVar = null;
         try {
           rawSettings = JSON.parse((0, import_strip_json_comments2.default)(content));
         } catch (parseError) {
+          debugLogger3.warn(
+            `Settings file ${filePath} has invalid JSON (${getErrorMessage(parseError)}). Resetting to empty settings.`
+          );
           try {
             fs6.copyFileSync(filePath, corruptedPath);
             corruptedSaved = true;
@@ -19478,28 +19609,6 @@ function loadSettings(workspaceDir = process2.cwd(), consumeCorruptionEnvVars =
               `Failed to copy corrupted file: ${getErrorMessage(copyError)}`
             );
           }
-          const backupPath = `${filePath}.orig`;
-          if (fs6.existsSync(backupPath)) {
-            debugLogger3.warn(
-              `Settings file ${filePath} has invalid JSON (${getErrorMessage(parseError)}). Attempting recovery from backup ${backupPath}.`
-            );
-            try {
-              const backupContent = fs6.readFileSync(backupPath, "utf-8");
-              const backupSettings = JSON.parse(
-                (0, import_strip_json_comments2.default)(backupContent)
-              );
-              fs6.writeFileSync(filePath, backupContent, "utf-8");
-              content = backupContent;
-              rawSettings = backupSettings;
-              const recoveryMsg = `Settings file ${filePath} had invalid JSON and was recovered from backup ${backupPath}. Some recent settings changes may have been lost.`;
-              debugLogger3.warn(recoveryMsg);
-              recoveredFromBackup = true;
-            } catch (backupError) {
-              debugLogger3.warn(
-                `Failed to recover from backup ${backupPath}: ${getErrorMessage(backupError)}. Falling back to empty settings.`
-              );
-            }
-          }
           if (!rawSettings) {
             const warningMsg = `Settings file ${filePath} has invalid JSON. Your settings have been reset.`;
             debugLogger3.warn(warningMsg);
@@ -19577,7 +19686,7 @@ function loadSettings(workspaceDir = process2.cwd(), consumeCorruptionEnvVars =
         };
         if (corruptedSaved) {
           result.corruptedPath = corruptedPath;
-          result.wasRecovered = recoveredFromBackup || (recoveredFromEnvVar ?? false);
+          result.wasRecovered = recoveredFromEnvVar ?? false;
         }
         return result;
       }
@@ -19599,7 +19708,8 @@ function loadSettings(workspaceDir = process2.cwd(), consumeCorruptionEnvVars =
     settings: {},
     rawJson: void 0
   };
-  if (realWorkspaceDir !== realHomeDir) {
+  const workspaceSettingsActive = realWorkspaceDir !== realHomeDir;
+  if (workspaceSettingsActive) {
     workspaceResult = loadAndMigrate(
       workspaceSettingsPath,
       "Workspace" /* Workspace */
@@ -19697,7 +19807,8 @@ Please fix the configuration file(s) and try again.`
     migratedInMemorScopes,
     allMigrationWarnings,
     userResult.corruptedPath,
-    userResult.wasRecovered ?? false
+    userResult.wasRecovered ?? false,
+    workspaceSettingsActive
   );
 }
 __name(loadSettings, "loadSettings");
@@ -19966,7 +20077,7 @@ __name(getPackageJson, "getPackageJson");
 // packages/cli/src/utils/version.ts
 async function getCliVersion() {
   const pkgJson = await getPackageJson();
-  return "0.18.3";
+  return "0.18.4";
 }
 __name(getCliVersion, "getCliVersion");
 
@@ -20027,6 +20138,9 @@ var formatDuration = /* @__PURE__ */ __name((milliseconds, options) => {
   const totalSeconds = milliseconds / 1e3;
   if (totalSeconds < 60) {
     const formatted = totalSeconds.toFixed(1);
+    if (parseFloat(formatted) >= 60) {
+      return "1m";
+    }
     if (options?.hideTrailingZeros && formatted.endsWith(".0")) {
       return `${formatted.slice(0, -2)}s`;
     }
@@ -20120,7 +20234,7 @@ import { execFile } from "node:child_process";
 
 // packages/cli/src/generated/git-commit.ts
 init_esbuild_shims();
-var GIT_COMMIT_INFO = "4346b8b98";
+var GIT_COMMIT_INFO = "c898e9f6a";
 
 // packages/cli/src/utils/systemInfo.ts
 var debugLogger4 = createDebugLogger("STATUS");
@@ -20297,6 +20411,7 @@ export {
   updateOutputLanguageFile,
   writeOutputLanguageAndRegisterPath,
   initializeLlmOutputLanguage,
+  getFlattenedSchema,
   getSettingDefinition,
   requiresRestart,
   getDefaultValue,
@@ -20400,12 +20515,12 @@ export {
  */
 /**
  * @license
- * Copyright 2025 Qwen team
+ * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
 /**
  * @license
- * Copyright 2025 Google LLC
+ * Copyright 2025 Qwen team
  * SPDX-License-Identifier: Apache-2.0
  */
 /**