refactor: changes for reset

Author: krithika7402

src/core/webview/ClineProvider.ts

@@ -38,9 +38,7 @@ import { deleteFromContextDirectory } from "../../utils/delete-helper"
 import delay from "delay"
 import { AutoApprovalSettings, DEFAULT_AUTO_APPROVAL_SETTINGS } from "../../shared/AutoApprovalSettings"
 import { HaiBuildDefaults } from "../../shared/haiDefaults"
-import chokidar, { FSWatcher } from "chokidar"
 import { buildEmbeddingHandler } from "../../embedding"
-import { existsSync } from "fs"
 
 /*
 https://github.com/microsoft/vscode-webview-ui-toolkit-samples/blob/main/default/weather-webview/src/providers/WeatherViewProvider.ts
@@ -801,13 +799,19 @@ export class ClineProvider implements vscode.WebviewViewProvider {
 									await fs.writeFile(filePath, fileInstruction.content, "utf8");
 								}
 							}
+							vscode.window.showInformationMessage(`${message.fileInstructions.length} files uploaded successfully`);
 						}
 						break;
 					case "deleteInstruction":
 						const dir = path.join(this.vsCodeWorkSpaceFolderFsPath, HaiBuildDefaults.defaultInstructionsDirectory);
 						if(message.text) {
 							try {
 								const filePath = path.join(dir, message.text);
+								let doesFileExist = await fileExistsAtPath(filePath);
+								if (!doesFileExist) {
+									vscode.window.showErrorMessage(`${message.text} does not exist.`);
+									break;
+								}
 								await fs.unlink(filePath);
 								vscode.window.showInformationMessage(message.text + " has been deleted.");
 							} catch (error) {
@@ -1038,43 +1042,16 @@ export class ClineProvider implements vscode.WebviewViewProvider {
 		await this.postStateToWebview()
 	}
 
-	async removeFromFileInstructions(deletedFiles: string[]) {
-		const fileInstructions = await this.customGetState("fileInstructions") as HaiInstructionFile[];
-		const deletedFileNames = deletedFiles.map(path => path.split('/').pop());
-		const updatedFileInstructions = fileInstructions?.filter(
-			(instruction) => !deletedFileNames.includes(instruction.name)
-		);
-		this.updateFileInstructions(updatedFileInstructions);
-	}
-
-	async addFileInstruction(filePaths: string[]) {
-		const fileInstructions = await this.customGetState("fileInstructions") as HaiInstructionFile[];
-			const newInstructions = await Promise.all(filePaths.map(async (filePath) => ({
-			name: filePath.split("/").pop(),
-			enabled: false,
-		})));
-	
-		newInstructions.forEach((instruction) => {
-			if (instruction.name) {
-				fileInstructions?.push(instruction as HaiInstructionFile);
-			}
-		});
-		await this.updateFileInstructions(fileInstructions);
-	}
-
 	async checkInstructionFilesFromFileSystem() {
 		const workspaceFolder = this.getWorkspacePath();
 		if (!workspaceFolder) { return; }
 		const instructionsPath = path.join(workspaceFolder, HaiBuildDefaults.defaultInstructionsDirectory);
 		try {
 			const files = await fs.readdir(instructionsPath);
-			const filesInSystemSet = new Set(files.filter(file => file.endsWith('.md')));
-			
-			const currentState = await this.getState();
-			const fileInstructions = currentState.fileInstructions || [];
-			
+			const filesInSystemSet = new Set(files.filter(file => file.endsWith('.md')));			
+			const fileInstructions = await this.customGetState("fileInstructions") as HaiInstructionFile[];		
 			const existingInstructionsMap = new Map(
-				fileInstructions.map(instruction => [instruction.name, instruction.enabled])
+				fileInstructions?.map(instruction => [instruction.name, instruction.enabled])
 			);
 
 			const updatedInstructions = Array.from(filesInSystemSet, name => ({
@@ -1798,12 +1775,6 @@ export class ClineProvider implements vscode.WebviewViewProvider {
 			await this.context.globalState.update(key, undefined)
 		}
 
-		let workspaceName = this.getWorkspacePath()
-		if (workspaceName) {
-			let instructionsDir = path.join(workspaceName, HaiBuildDefaults.defaultInstructionsDirectory)
-			fs.rmdir(instructionsDir, { recursive: true })
-		}
-
 		const secretKeys: SecretKey[] = [
 			"apiKey",
 			"openRouterApiKey",
@@ -1829,6 +1800,7 @@ export class ClineProvider implements vscode.WebviewViewProvider {
 			this.cline = undefined
 		}
 		vscode.window.showInformationMessage("State reset")
+		await this.checkInstructionFilesFromFileSystem()
 		await this.postStateToWebview()
 		await this.postMessageToWebview({ type: "action", action: "chatButtonClicked" })
 	}

src/integrations/workspace/HaiFileSystemWatcher.ts

@@ -11,14 +11,17 @@ class HaiFileSystemWatcher {
 	private ig: ReturnType<typeof ignore>
 	private providerRef: WeakRef<ClineProvider>
 	private watcher: Watcher
+	private instructionsDir: string
 
 	constructor(provider: ClineProvider, sourceFolder: string) {
 		this.sourceFolder = sourceFolder
 		this.providerRef = new WeakRef(provider)
 		this.ig = ignore()
+		this.instructionsDir = path.join(this.sourceFolder, HaiBuildDefaults.defaultInstructionsDirectory)
+
 		this.watcher = new Watcher(this.sourceFolder, {
 			recursive: true,
-			debounce: 3000,
+			debounce: 1000,
 			ignoreInitial: true,
 			ignore: (targetPath: string) => {
 				if (!targetPath || targetPath.trim() === "") {
@@ -48,7 +51,7 @@ class HaiFileSystemWatcher {
 			const gitignorePath = path.join(this.sourceFolder, ".gitignore")
 			const content = await fs.readFile(gitignorePath, "utf-8")
 
-			this.ig.add(content.split("\n").filter((line) => line.trim() && !line.startsWith("#")))
+			this.ig.add(content.split("\n").filter((line) => line.trim() && !line.startsWith("#") && !line.includes(".vscode")))
 		} catch (error) {
 			console.log("HaiFileSystemWatcher No .gitignore found, using default exclusions.")
 		}
@@ -61,41 +64,28 @@ class HaiFileSystemWatcher {
 
 		this.watcher.on("unlink", (filePath) => {
 			console.log("HaiFileSystemWatcher File deleted", filePath)
-            if (filePath.includes("hai-instructions")) {
-				this.providerRef.deref()?.removeFromFileInstructions([filePath])
+			if (filePath.includes(this.instructionsDir)) {
+				this.providerRef.deref()?.checkInstructionFilesFromFileSystem()
 			} else {
-				this.providerRef.deref()?.invokeReindex([filePath], FileOperations.Create)
+				this.providerRef.deref()?.invokeReindex([filePath], FileOperations.Delete)
 			}
-			this.providerRef.deref()?.invokeReindex([filePath], FileOperations.Delete)
 		})
 
 		this.watcher.on("add", (filePath) => {
 			console.log("HaiFileSystemWatcher File added", filePath)
-			if (filePath.includes("hai-instructions")) {
-				this.providerRef.deref()?.addFileInstruction([filePath])
+			if (filePath.includes(this.instructionsDir)) {
+				this.providerRef.deref()?.checkInstructionFilesFromFileSystem()
 			} else {
 				this.providerRef.deref()?.invokeReindex([filePath], FileOperations.Create)
 			}
 		})
 
 		this.watcher.on("change", (filePath) => {
 			console.log("HaiFileSystemWatcher File changes", filePath)
-			this.providerRef.deref()?.invokeReindex([filePath], FileOperations.Change)
-		})
-
-		this.watcher.on("addDir", (filePath) => {
-			let value = filePath.split("/").pop() === "hai-instructions"
-			console.log("HaiFileSystemWatcher Folder added", value)
-			if (value) {
+			if (filePath.includes(this.instructionsDir)) {
 				this.providerRef.deref()?.checkInstructionFilesFromFileSystem()
-			}
-		})
-
-		this.watcher.on("unlinkDir", (filePath) => {
-			let value = filePath.split("/").pop() === ".vscode" || filePath.split("/").pop() === "hai-instructions"
-			console.log("HaiFileSystemWatcher Folder deleted", value)
-			if (value) {
-				this.providerRef.deref()?.updateFileInstructions([])
+			} else {
+				this.providerRef.deref()?.invokeReindex([filePath], FileOperations.Change)
 			}
 		})
 	}

webview-ui/src/components/chat/CustomInstructionsMenu.tsx

@@ -1,4 +1,4 @@
-import React, { useState } from "react";
+import React, { useEffect, useState } from "react";
 import { VSCodeCheckbox } from "@vscode/webview-ui-toolkit/react";
 import styled from "styled-components";
 import { vscode } from "../../utils/vscode";
@@ -33,6 +33,14 @@ const CustomInstructionsMenu = ({
       ? true
       : false
   );
+  
+  useEffect(() => {
+    setAllInstructionsEnabled(
+      (fileInstructions?.every((i) => i.enabled === true) ?? false) &&
+        customInstructions !== undefined &&
+        isCustomInstructionsEnabled
+    );
+  }, [fileInstructions, customInstructions, isCustomInstructionsEnabled]);
 
   const toggleInstruction = (index: number) => {
     const updatedInstructions = fileInstructions ? [...fileInstructions] : [];