merge main branch functionalities

packages/cli/src/config/config.test.ts

@@ -6,7 +6,7 @@
 
 import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
 import * as os from 'os';
-import { loadCliConfig, parseArguments } from './config.js';
+import { loadCliConfig, parseArguments, CliArgs } from './config.js';
 import { Settings } from './settings.js';
 import { Extension } from './extension.js';
 import * as ServerConfig from '@qwen-code/qwen-code-core';
@@ -561,6 +561,68 @@ describe('mergeMcpServers', () => {
   });
 });
 
+describe('loadCliConfig systemPromptMappings', () => {
+  it('should use default systemPromptMappings when not provided in settings', async () => {
+    const mockSettings: Settings = {
+      theme: 'dark',
+    };
+    const mockExtensions: Extension[] = [];
+    const mockSessionId = 'test-session';
+    const mockArgv: CliArgs = {
+      model: 'test-model',
+    } as CliArgs;
+
+    const config = await loadCliConfig(
+      mockSettings,
+      mockExtensions,
+      mockSessionId,
+      mockArgv,
+    );
+
+    expect(config.getSystemPromptMappings()).toEqual([
+      {
+        baseUrls: [
+          'https://dashscope.aliyuncs.com/compatible-mode/v1/',
+          'https://dashscope-intl.aliyuncs.com/compatible-mode/v1/',
+        ],
+        modelNames: ['qwen3-coder-plus'],
+        template:
+          'SYSTEM_TEMPLATE:{"name":"qwen3_coder","params":{"is_git_repository":{RUNTIME_VARS_IS_GIT_REPO},"sandbox":"{RUNTIME_VARS_SANDBOX}"}}',
+      },
+    ]);
+  });
+
+  it('should use custom systemPromptMappings when provided in settings', async () => {
+    const customSystemPromptMappings = [
+      {
+        baseUrls: ['https://custom-api.com'],
+        modelNames: ['custom-model'],
+        template: 'Custom template',
+      },
+    ];
+    const mockSettings: Settings = {
+      theme: 'dark',
+      systemPromptMappings: customSystemPromptMappings,
+    };
+    const mockExtensions: Extension[] = [];
+    const mockSessionId = 'test-session';
+    const mockArgv: CliArgs = {
+      model: 'test-model',
+    } as CliArgs;
+
+    const config = await loadCliConfig(
+      mockSettings,
+      mockExtensions,
+      mockSessionId,
+      mockArgv,
+    );
+
+    expect(config.getSystemPromptMappings()).toEqual(
+      customSystemPromptMappings,
+    );
+  });
+});
+
 describe('mergeExcludeTools', () => {
   it('should merge excludeTools from settings and extensions', async () => {
     const settings: Settings = { excludeTools: ['tool1', 'tool2'] };

packages/cli/src/config/config.ts

@@ -441,6 +441,8 @@ export async function loadCliConfig(
     model: argv.model!,
     extensionContextFilePaths,
     maxSessionTurns: settings.maxSessionTurns ?? -1,
+    sessionTokenLimit: settings.sessionTokenLimit ?? 32000,
+    maxFolderItems: settings.maxFolderItems ?? 20,
     experimentalAcp: argv.experimentalAcp || false,
     listExtensions: argv.listExtensions || false,
     extensions: allExtensions,
@@ -465,6 +467,7 @@ export async function loadCliConfig(
           'SYSTEM_TEMPLATE:{"name":"qwen3_coder","params":{"is_git_repository":{RUNTIME_VARS_IS_GIT_REPO},"sandbox":"{RUNTIME_VARS_SANDBOX}"}}',
       },
     ],
+    contentGenerator: settings.contentGenerator,
   });
 }
 

packages/cli/src/config/settings.ts

@@ -95,6 +95,12 @@ export interface Settings {
   // Setting for setting maximum number of user/model/tool turns in a session.
   maxSessionTurns?: number;
 
+  // Setting for maximum token limit for conversation history before blocking requests
+  sessionTokenLimit?: number;
+
+  // Setting for maximum number of files and folders to show in folder structure
+  maxFolderItems?: number;
+
   // A map of tool names to their summarization settings.
   summarizeToolOutput?: Record<string, SummarizeToolOutputSettings>;
 
@@ -109,6 +115,10 @@ export interface Settings {
     modelNames: string[];
     template: string;
   }>;
+  contentGenerator?: {
+    timeout?: number;
+    maxRetries?: number;
+  };
 }
 
 export interface SettingsError {