Merge branch 'master' into 'opensource'

Detailing and effect enhancement

See merge request ai_native/DeepVCode/DeepVcodeClient!329

Author: JerryliDe

packages/cli/src/ui/components/HealthyUseReminder.tsx

@@ -15,7 +15,7 @@ interface HealthyUseReminderProps {
 }
 
 export function HealthyUseReminder({ onDismiss }: HealthyUseReminderProps): React.JSX.Element {
-  const [countdown, setCountdown] = useState(300); // 300秒倒计时
+  const [countdown, setCountdown] = useState(60); // 60秒倒计时
   const [canDismiss, setCanDismiss] = useState(false);
 
   useEffect(() => {

packages/core/src/core/prompts.ts

@@ -47,7 +47,7 @@ You are a long-running autonomous coding agent. Execute silently until done or b
 
 1. **NO NARRATION.** Never explain what you're about to do. Never summarize steps. No filler phrases.
 2. **EXECUTE FIRST.** Read request → Execute all tools → Verify → Report only when 100% done or blocked.
-3. **BATCH AGGRESSIVELY.** Multiple independent operations in ONE function_calls block.
+3. **SEQUENTIAL EXECUTION.** Execute tools one by one in separate function_calls blocks. Use batch tool only for 5+ truly independent operations.
 4. **OUTPUT BUDGET:** 1-2 sentences max unless user asks for explanation.
 5. **SILENT EXECUTION.** Do NOT output any text between tool calls. No progress updates, no intermediate explanations.
 
@@ -541,10 +541,6 @@ IMPORTANT: Assist with authorized security testing, defensive security, CTF chal
 
 IMPORTANT: You must NEVER generate or guess URLs for the user unless you are confident that the URLs are for helping the user with programming. You may use URLs provided by the user in their messages or local files.
 
-If the user asks for help or wants to give feedback inform them of the following:
-- /help: Get help with using the CLI
-- To give feedback, users should use the /bug command
-
 # Tone and style
 - Only use emojis if the user explicitly requests it. Avoid using emojis in all communication unless asked.
 - Output is displayed on a command line interface. Responses should be short and concise. Use Github-flavored markdown, rendered in monospace font under CommonMark specification.
@@ -830,10 +826,6 @@ When requested to perform tasks like fixing bugs, adding features, refactoring,
 - **Remembering Facts:** Use the '${MemoryTool.Name}' tool to remember specific, *user-related* facts or preferences when the user explicitly asks, or when they state a clear, concise piece of information that would help personalize or streamline *your future interactions with them* (e.g., preferred coding style, common project paths they use, personal tool aliases). This tool is for user-specific information that should persist across sessions. Do *not* use it for general project context or information that belongs in project-specific \`GEMINI.md\` files. If unsure whether to save something, you can ask the user, "Should I remember that for you?"
 - **Respect User Confirmations:** Most tool calls (also denoted as 'function calls') will first require confirmation from the user, where they will either approve or cancel the function call. If a user cancels a function call, respect their choice and do _not_ try to make the function call again. It is okay to request the tool call again _only_ if the user requests that same tool call on a subsequent prompt. When a user cancels a function call, assume best intentions from the user and consider inquiring if they prefer any alternative paths forward.
 
-## Interaction Details
-- **Help Command:** The user can use '/help' to display help information.
-- **Feedback:** To report a bug or provide feedback, please use the /bug command.
-
 # Examples (Illustrating Tone and Workflow)
 <example>
 user: 1 + 2

packages/core/src/tools/batch.ts

@@ -26,23 +26,23 @@ export class BatchTool extends BaseTool<BatchToolParams, ToolResult> {
         super(
             BatchTool.Name,
             'Batch',
-            `Execute multiple tools in parallel (or sequentially if dependencies exist, but this implementation runs them sequentially for safety).
+            `Execute multiple independent tools sequentially.
 
-WHEN TO USE:
-- Calling 2+ different tool types together (e.g., read_file + search_file_content + glob)
-- Performing 3+ independent operations of the same type
-- Gathering information from multiple sources at once
+Use this tool ONLY when you need to perform 5+ truly independent operations that have no sequential dependencies. For most cases, prefer individual tool calls in sequence.
 
-WHY USE BATCH:
-- JSON format is simpler and less error-prone than nested XML tool calls
-- Clearly expresses "these operations are a group"
-- Reduces cognitive load when generating multiple tool calls
+AVOID using batch for:
+- Operations with dependencies (one result feeds into another)
+- File edits followed by testing/validation
+- Less than 5 independent operations
+- Different tool types that may need result inspection between calls
 
-Example: To read a file, search for a pattern, and list files:
+Example (when appropriate - 5+ independent file reads):
 [
-  {"tool": "read_file", "parameters": {"absolute_path": "/path/to/file.ts"}},
-  {"tool": "search_file_content", "parameters": {"pattern": "TODO", "path": "/src"}},
-  {"tool": "glob", "parameters": {"pattern": "**/*.ts"}}
+  {"tool": "read_file", "parameters": {"absolute_path": "/path/to/file1.ts"}},
+  {"tool": "read_file", "parameters": {"absolute_path": "/path/to/file2.ts"}},
+  {"tool": "read_file", "parameters": {"absolute_path": "/path/to/file3.ts"}},
+  {"tool": "read_file", "parameters": {"absolute_path": "/path/to/file4.ts"}},
+  {"tool": "read_file", "parameters": {"absolute_path": "/path/to/file5.ts"}}
 ]`,
             Icon.Tasks,
             {

packages/core/src/tools/memoryTool.ts

@@ -59,8 +59,6 @@ export const MEMORY_SECTION_HEADER = '## DeepV Code Added Memories';
 export const DEFAULT_CONTEXT_FILENAMES = [
   'AGENTS.md',
   'DEEPV.md',
-  'GEMINI.md', 
-  'CLAUDE.md',
   '.augement/*.md',
   '.cursor/rules/*.mdc'
 ];
@@ -100,11 +98,11 @@ export function getAllGeminiMdFilenames(): string[] {
  */
 export async function discoverContextFilenames(baseDir: string = path.join(homedir(), GEMINI_CONFIG_DIR)): Promise<string[]> {
   const foundFiles = await findContextFilesInDirectory(baseDir, DEFAULT_CONTEXT_FILENAMES);
-  
+
   if (foundFiles.length > 0) {
     return [path.basename(foundFiles[0])];
   }
-  
+
   return [DEFAULT_CONTEXT_FILENAME];
 }
 
@@ -165,21 +163,21 @@ export const COMMON_IGNORE_PATTERNS = [
  */
 async function findContextFilesInDirectory(baseDir: string, filePatterns: string[]): Promise<string[]> {
   const foundFiles: string[] = [];
-  
+
   try {
     // Ensure directory exists
     await fs.mkdir(baseDir, { recursive: true });
   } catch (error) {
     console.warn(`Warning: failed to create directory ${baseDir}: ${error}`);
     return [];
   }
-  
+
   for (const pattern of filePatterns) {
     if (pattern.includes('*')) {
       // Handle glob patterns
       try {
         const fullPattern = path.join(baseDir, pattern);
-        const matches = await glob(fullPattern, { 
+        const matches = await glob(fullPattern, {
           cwd: baseDir,
           absolute: true,
           nodir: true,
@@ -195,21 +193,21 @@ async function findContextFilesInDirectory(baseDir: string, filePatterns: string
     } else {
       // Handle direct file paths
       const filePath = path.join(baseDir, pattern);
-      
+
       // Check if the file path matches any ignore patterns
       const relativePath = path.relative(baseDir, filePath);
       const shouldIgnore = COMMON_IGNORE_PATTERNS.some(ignorePattern => {
         // Remove /** suffix for directory matching
         const cleanPattern = ignorePattern.replace('/**', '');
-        return relativePath.startsWith(cleanPattern) || 
+        return relativePath.startsWith(cleanPattern) ||
                relativePath.includes(`/${cleanPattern}/`) ||
                relativePath.includes(`\\${cleanPattern}\\`);
       });
-      
+
       if (shouldIgnore) {
         continue; // Skip this file
       }
-      
+
       try {
         await fs.access(filePath);
         foundFiles.push(filePath);
@@ -219,7 +217,7 @@ async function findContextFilesInDirectory(baseDir: string, filePatterns: string
       }
     }
   }
-  
+
   return foundFiles;
 }
 
@@ -234,22 +232,22 @@ async function discoverProjectContextFilenames(projectDir: string = process.cwd(
   // Check if the project directory itself should be ignored
   const shouldIgnoreProjectDir = COMMON_IGNORE_PATTERNS.some(ignorePattern => {
     const cleanPattern = ignorePattern.replace('/**', '');
-    return projectDir.includes(`/${cleanPattern}/`) || 
+    return projectDir.includes(`/${cleanPattern}/`) ||
            projectDir.includes(`\\${cleanPattern}\\`) ||
            projectDir.endsWith(`/${cleanPattern}`) ||
            projectDir.endsWith(`\\${cleanPattern}`);
   });
-  
+
   if (shouldIgnoreProjectDir) {
     return []; // Don't search in ignored directories
   }
-  
+
   const foundFiles = await findContextFilesInDirectory(projectDir, DEFAULT_CONTEXT_FILENAMES);
-  
+
   if (foundFiles.length > 0) {
     return [path.basename(foundFiles[0])];
   }
-  
+
   return [];
 }
 

packages/vscode-ui-plugin/webview/src/components/HealthyUseReminder.test.tsx

@@ -32,7 +32,7 @@ describe('HealthyUseReminder', () => {
     render(<HealthyUseReminder onDismiss={onDismiss} />);
 
     expect(screen.getByText(/healthy.reminderTitle/i)).toBeDefined();
-    expect(screen.getByText(/300/i)).toBeDefined();
+    expect(screen.getByText(/60/i)).toBeDefined();
   });
 
   it('should countdown every second', () => {
@@ -42,20 +42,20 @@ describe('HealthyUseReminder', () => {
     act(() => {
       vi.advanceTimersByTime(1000);
     });
-    expect(screen.getByText(/299/i)).toBeDefined();
+    expect(screen.getByText(/59/i)).toBeDefined();
 
     act(() => {
       vi.advanceTimersByTime(10000);
     });
-    expect(screen.getByText(/289/i)).toBeDefined();
+    expect(screen.getByText(/49/i)).toBeDefined();
   });
 
   it('should show dismiss button as enabled when countdown reaches zero', () => {
     const onDismiss = vi.fn();
     render(<HealthyUseReminder onDismiss={onDismiss} />);
 
     act(() => {
-      vi.advanceTimersByTime(300000);
+      vi.advanceTimersByTime(60000);
     });
 
     const button = screen.getByRole('button');
@@ -67,7 +67,7 @@ describe('HealthyUseReminder', () => {
     render(<HealthyUseReminder onDismiss={onDismiss} />);
 
     act(() => {
-      vi.advanceTimersByTime(300000);
+      vi.advanceTimersByTime(60000);
     });
 
     const dismissButton = screen.getByRole('button');

packages/vscode-ui-plugin/webview/src/components/HealthyUseReminder.tsx

@@ -15,7 +15,7 @@ interface HealthyUseReminderProps {
 
 export const HealthyUseReminder: React.FC<HealthyUseReminderProps> = ({ onDismiss }) => {
   const { t } = useTranslation();
-  const [countdown, setCountdown] = useState(300); // 300 seconds cooldown
+  const [countdown, setCountdown] = useState(60); // 60 seconds cooldown
   const [canDismiss, setCanDismiss] = useState(false);
 
   useEffect(() => {