feat: enhance configuration validation and update workspace settings handling

Author: bruc3van

src/configuration.ts

@@ -228,7 +228,7 @@ export class ConfigurationManager {
         const config = resource
             ? vscode.workspace.getConfiguration(ConfigurationManager.SECTION, resource)
             : this.getConfig();
-        await config.update(key, value, target || vscode.ConfigurationTarget.Global);
+        await config.update(key, value, target || vscode.ConfigurationTarget.Workspace);
     }
 
     /**
@@ -262,6 +262,7 @@ export class ConfigurationManager {
         const config = this.getConfig();
         for (const key of ConfigurationManager.RESETTABLE_KEYS) {
             await config.update(key, undefined, vscode.ConfigurationTarget.Global);
+            await config.update(key, undefined, vscode.ConfigurationTarget.Workspace);
         }
     }
 
@@ -284,6 +285,44 @@ export class ConfigurationManager {
             }
         }
 
+        // Validate numeric bounds (mirrors package.json constraints)
+        const imageMinSize = this.getImageMinSize();
+        if (imageMinSize < 1) {
+            errors.push(`imageMinSize must be >= 1, got ${imageMinSize}`);
+        }
+
+        const threshold = this.getDocumentSplittingThreshold();
+        if (threshold < 100000 || threshold > 2000000) {
+            errors.push(`documentSplittingThreshold must be between 100000 and 2000000, got ${threshold}`);
+        }
+
+        const batchWindow = this.getBatchDetectionWindow();
+        if (batchWindow < 1000 || batchWindow > 10000) {
+            errors.push(`batchDetectionWindow must be between 1000 and 10000, got ${batchWindow}`);
+        }
+
+        // Validate non-empty string settings
+        const subdirectoryName = this.getMarkdownSubdirectoryName();
+        if (typeof subdirectoryName !== 'string' || !subdirectoryName.trim()) {
+            errors.push('markdownSubdirectoryName must be a non-empty string');
+        }
+
+        const imageFolder = this.getImageOutputFolder();
+        if (typeof imageFolder !== 'string' || !imageFolder.trim()) {
+            errors.push('imageOutputFolder must be a non-empty string');
+        }
+
+        // Validate enum values
+        const validBatchBehaviors: BatchConversionBehavior[] = ['askForEach', 'askOnce', 'convertAll', 'skipAll'];
+        if (!validBatchBehaviors.includes(this.getBatchConversionBehavior())) {
+            errors.push(`Invalid batchConversionBehavior value`);
+        }
+
+        const validDeleteBehaviors: DeleteGeneratedOutputsBehavior[] = ['ask', 'delete', 'keep'];
+        if (!validDeleteBehaviors.includes(this.getDeleteGeneratedOutputsBehavior())) {
+            errors.push(`Invalid deleteGeneratedOutputsBehavior value`);
+        }
+
         return {
             isValid: errors.length === 0,
             errors

src/fileWatcher.ts

@@ -31,9 +31,9 @@ export class FileWatcher implements vscode.Disposable {
         this.projectManager = projectManager;
         this.initializeWatchers();
 
-        // Listen for configuration changes
+        // Listen for configuration changes - only rebuild watchers when watcher-relevant settings change
         this.configChangeDisposable = vscode.workspace.onDidChangeConfiguration(e => {
-            if (e.affectsConfiguration('documentConverter')) {
+            if (this.affectsWatcherPattern(e)) {
                 this.reinitializeWatchers();
             }
         });
@@ -130,6 +130,9 @@ export class FileWatcher implements vscode.Disposable {
                 return;
             }
 
+            // If a create event is already queued for this path, skip the change event.
+            // The pending flush will read the file at processing time, capturing any
+            // modifications made between create and flush.
             if (eventType === 'changed' && this.pendingCreatedFiles.has(filePath)) {
                 console.log(`Skipping change event because create event is already queued: ${filePath}`);
                 return;
@@ -250,6 +253,16 @@ export class FileWatcher implements vscode.Disposable {
         this.initializeWatchers();
     }
 
+    /**
+     * Check if a configuration change affects the watcher glob pattern.
+     * Only settings that change which files are watched require a rebuild.
+     */
+    private affectsWatcherPattern(e: vscode.ConfigurationChangeEvent): boolean {
+        return e.affectsConfiguration('documentConverter.copyTextFiles')
+            || e.affectsConfiguration('documentConverter.organizeInSubdirectory')
+            || e.affectsConfiguration('documentConverter.markdownSubdirectoryName');
+    }
+
     private disposeWatchers(): void {
         this.watchers.forEach(watcher => watcher.dispose());
         this.watchers = [];
@@ -410,6 +423,7 @@ export class FileWatcher implements vscode.Disposable {
             return;
         }
 
+        // 'askOnce': batch confirmation when multiple files, single confirmation when one file
         if (behavior === 'askOnce' && existingFiles.length > 1) {
             const shouldConvert = await this.askForBatchConversionConfirmation(existingFiles);
             if (shouldConvert) {
@@ -418,6 +432,7 @@ export class FileWatcher implements vscode.Disposable {
             return;
         }
 
+        // 'askForEach': confirm each file individually (also handles 'askOnce' with a single file)
         await this.processCreatedFilesIndividually(existingFiles);
     }
 

src/projectManager.ts

@@ -2,6 +2,7 @@ import * as vscode from 'vscode';
 import * as fs from 'fs';
 import * as path from 'path';
 import { localize } from './i18n';
+import { SUPPORTED_CONVERT_EXTENSIONS } from './constants';
 
 export interface ProjectConfig {
     enabled: boolean;
@@ -116,7 +117,7 @@ export class ProjectManager {
     }
 
     /**
-     * 检查项目中是否有可转换的文档文件
+     * 检查项目中是否有可转换的文档文件（扫描根目录及一级子目录）
      */
     hasConvertibleFiles(rootPath?: string): boolean {
         const workspaceFolders = vscode.workspace.workspaceFolders;
@@ -125,14 +126,31 @@ export class ProjectManager {
         }
 
         const targetPath = rootPath || workspaceFolders[0].uri.fsPath;
-        const supportedExtensions = ['.docx', '.xlsx', '.pptx', '.pdf'];
-        
+
         try {
-            const files = fs.readdirSync(targetPath);
-            return files.some(file => {
-                const ext = path.extname(file).toLowerCase();
-                return supportedExtensions.includes(ext);
-            });
+            const entries = fs.readdirSync(targetPath, { withFileTypes: true });
+            for (const entry of entries) {
+                if (entry.isFile()) {
+                    const ext = path.extname(entry.name).toLowerCase();
+                    if (SUPPORTED_CONVERT_EXTENSIONS.includes(ext)) {
+                        return true;
+                    }
+                } else if (entry.isDirectory() && !entry.name.startsWith('.')) {
+                    // Scan one level of subdirectories, skipping hidden folders
+                    try {
+                        const subEntries = fs.readdirSync(path.join(targetPath, entry.name));
+                        for (const subEntry of subEntries) {
+                            const ext = path.extname(subEntry).toLowerCase();
+                            if (SUPPORTED_CONVERT_EXTENSIONS.includes(ext)) {
+                                return true;
+                            }
+                        }
+                    } catch {
+                        // Skip directories we can't read
+                    }
+                }
+            }
+            return false;
         } catch (error) {
             console.error('Error checking for convertible files:', error);
             return false;
@@ -177,16 +195,8 @@ export class ProjectManager {
                 );
 
                 if (choice === convertNowLabel) {
-                    // 触发文件夹转换命令
                     await vscode.commands.executeCommand('documentConverter.convertFolder', vscode.Uri.file(rootPath));
                 }
-            } else if (!showConvertPrompt) {
-                // 当 showConvertPrompt 为 false 时，不显示任何消息，由调用方处理
-                // 这避免了重复的消息提示
-            } else {
-                vscode.window.showInformationMessage(
-                    localize('project.info.enabledReady')
-                );
             }
 
             return true;
@@ -297,23 +307,7 @@ export class ProjectManager {
 
         switch (choice) {
             case enableLabel:
-                // 用户已经在第一个弹窗中表达了启用意图，直接启用并自动转换，无需再次询问
-                const enabled = await this.enableForProject(undefined, false);
-                if (enabled) {
-                    const workspaceFolders = vscode.workspace.workspaceFolders;
-                    if (workspaceFolders && this.hasConvertibleFiles(workspaceFolders[0].uri.fsPath)) {
-                        // 直接执行转换，不再询问
-                        await vscode.commands.executeCommand('documentConverter.convertFolder', workspaceFolders[0].uri);
-                        vscode.window.showInformationMessage(
-                            localize('project.info.conversionStarted')
-                        );
-                    } else {
-                        vscode.window.showInformationMessage(
-                            localize('project.info.enabledReady')
-                        );
-                    }
-                }
-                return enabled;
+                return await this.enableForProject(undefined, true);
             case dontAskAgainLabel:
                 await this.saveWorkspaceProjectConfig(
                     vscode.workspace.workspaceFolders![0].uri.fsPath,