Merge remote-tracking branch 'origin/main' into feat/remove-smart-edit-tool

# Conflicts:
#	packages/core/index.ts
#	packages/core/src/index.ts

packages/cli/src/config/config.ts

@@ -10,6 +10,7 @@ import {
   Config,
   DEFAULT_QWEN_EMBEDDING_MODEL,
   FileDiscoveryService,
+  FileEncoding,
   getCurrentGeminiMdFilename,
   loadServerHierarchicalMemory,
   setGeminiMdFilename as setServerGeminiMdFilename,
@@ -1028,6 +1029,8 @@ export async function loadCliConfig(
     // always be true and the settings file can never disable recording.
     chatRecording:
       argv.chatRecording ?? settings.general?.chatRecording ?? true,
+    defaultFileEncoding:
+      settings.general?.defaultFileEncoding ?? FileEncoding.UTF8,
     lsp: {
       enabled: lspEnabled,
     },