fix: detect changes in the expert when the user manually updates through the terminal or file explorer. (#87)

magesh-presidio · web-flow · commit ae2fdc712deb · 2025-04-07T10:24:08.000+05:30
diff --git a/.changeset/healthy-houses-sin.md b/.changeset/healthy-houses-sin.md
@@ -0,0 +1,8 @@
+---
+"hai-build-code-generator": patch
+---
+
+Automatically sync custom experts when users manually update or delete experts. 
+Replaced home icon with plus icon and adjusted the order. 
+Added validation to ensure the file exists before deleting it from the context directory.
+Added schema validation for expert data.
diff --git a/package.json b/package.json
@@ -84,7 +84,7 @@
 			{
 				"command": "hai.plusButtonClicked",
 				"title": "New Task",
-				"icon": "$(home)"
+				"icon": "$(add)"
 			},
 			{
 				"command": "hai.mcpButtonClicked",
@@ -147,17 +147,17 @@
 		"menus": {
 			"view/title": [
 				{
-					"command": "hai.haiBuildTaskListClicked",
+					"command": "hai.plusButtonClicked",
 					"group": "navigation@1",
 					"when": "view == hai.SidebarProvider"
 				},
 				{
-					"command": "hai.expertsButtonClicked",
-					"group": "navigation@2",
+					"command": "hai.haiBuildTaskListClicked",
+					"group": "navigation@1",
 					"when": "view == hai.SidebarProvider"
 				},
 				{
-					"command": "hai.plusButtonClicked",
+					"command": "hai.expertsButtonClicked",
 					"group": "navigation@2",
 					"when": "view == hai.SidebarProvider"
 				},
diff --git a/src/core/controller/index.ts b/src/core/controller/index.ts
@@ -734,7 +734,7 @@ export class Controller {
 				}
 
 				// plan act setting
-				if (message.planActSeparateModelsSetting != undefined) {
+				if (message.planActSeparateModelsSetting !== undefined) {
 					await customUpdateState(this.context, "planActSeparateModelsSetting", message.planActSeparateModelsSetting)
 				}
 
@@ -835,11 +835,7 @@ export class Controller {
 				}
 				break
 			case "loadExperts":
-				const experts = await this.expertManager.readExperts(this.vsCodeWorkSpaceFolderFsPath)
-				await this.postMessageToWebview({
-					type: "expertsUpdated",
-					experts,
-				})
+				await this.loadExperts()
 				break
 			case "onHaiConfigure":
 				const isConfigureEnabled = message.bool !== undefined ? message.bool : true
@@ -2503,4 +2499,12 @@ Here is the project's README to help you get started:\n\n${mcpDetails.readmeCont
 		})
 		await this.postStateToWebview()
 	}
+
+	async loadExperts() {
+		const experts = await this.expertManager.readExperts(this.vsCodeWorkSpaceFolderFsPath)
+		await this.postMessageToWebview({
+			type: "expertsUpdated",
+			experts,
+		})
+	}
 }
diff --git a/src/core/experts/ExpertManager.ts b/src/core/experts/ExpertManager.ts
@@ -1,7 +1,9 @@
 import fs from "fs/promises"
 import * as path from "path"
-import { ExpertData } from "../../../webview-ui/src/types/experts"
+import * as vscode from "vscode"
+import { ExpertData, ExpertDataSchema } from "../../../webview-ui/src/types/experts"
 import { fileExistsAtPath, createDirectoriesForFile } from "../../utils/fs"
+import { GlobalFileNames } from "../../global-constants"
 
 export class ExpertManager {
 	/**
@@ -14,11 +16,17 @@ export class ExpertManager {
 			throw new Error("No workspace path provided")
 		}
 
+		// Validate expert data with Zod schema
+		const validationResult = ExpertDataSchema.safeParse(expert)
+		if (!validationResult.success) {
+			throw new Error(`Invalid expert data: ${validationResult.error.message}`)
+		}
+
 		// Create a sanitized folder name from the expert name
 		const sanitizedName = expert.name.replace(/[^a-zA-Z0-9_-]/g, "_").toLowerCase()
 
 		// Create the expert directory
-		const expertDir = path.join(workspacePath, ".hai-experts", sanitizedName)
+		const expertDir = path.join(workspacePath, GlobalFileNames.experts, sanitizedName)
 		await createDirectoriesForFile(path.join(expertDir, "placeholder.txt"))
 
 		// Create metadata file
@@ -45,7 +53,7 @@ export class ExpertManager {
 			return []
 		}
 
-		const expertsDir = path.join(workspacePath, ".hai-experts")
+		const expertsDir = path.join(workspacePath, GlobalFileNames.experts)
 		if (!(await fileExistsAtPath(expertsDir))) {
 			return []
 		}
@@ -62,22 +70,31 @@ export class ExpertManager {
 					try {
 						// Read metadata
 						const metadataPath = path.join(expertDir, "metadata.json")
-						if (await fileExistsAtPath(metadataPath)) {
+						const promptPath = path.join(expertDir, "prompt.md")
+
+						if ((await fileExistsAtPath(metadataPath)) && (await fileExistsAtPath(promptPath))) {
 							const metadataContent = await fs.readFile(metadataPath, "utf-8")
 							const metadata = JSON.parse(metadataContent)
 
 							// Read prompt
-							const promptPath = path.join(expertDir, "prompt.md")
-							const promptContent = (await fileExistsAtPath(promptPath))
-								? await fs.readFile(promptPath, "utf-8")
-								: ""
+							const promptContent = await fs.readFile(promptPath, "utf-8")
 
-							experts.push({
+							const expertData = {
 								name: metadata.name,
 								isDefault: metadata.isDefault,
 								prompt: promptContent,
 								createdAt: metadata.createdAt,
-							})
+							}
+
+							// Validate expert data with Zod schema
+							const validationResult = ExpertDataSchema.safeParse(expertData)
+							if (validationResult.success) {
+								experts.push(expertData)
+							} else {
+								vscode.window.showWarningMessage(
+									`Invalid expert data for ${folder}: ${validationResult.error.issues.map((issue) => issue.message).join(", ")}`,
+								)
+							}
 						}
 					} catch (error) {
 						console.error(`Failed to read expert from ${folder}:`, error)
@@ -102,7 +119,12 @@ export class ExpertManager {
 			throw new Error("No workspace path provided")
 		}
 
-		const expertsDir = path.join(workspacePath, ".hai-experts")
+		// Validate expert name
+		if (!expertName || typeof expertName !== "string") {
+			throw new Error("Expert name must be a non-empty string")
+		}
+
+		const expertsDir = path.join(workspacePath, GlobalFileNames.experts)
 		if (!(await fileExistsAtPath(expertsDir))) {
 			return
 		}
@@ -145,7 +167,12 @@ export class ExpertManager {
 			throw new Error("No workspace path provided")
 		}
 
-		const expertsDir = path.join(workspacePath, ".hai-experts")
+		// Validate expert name
+		if (!expertName || typeof expertName !== "string") {
+			throw new Error("Expert name must be a non-empty string")
+		}
+
+		const expertsDir = path.join(workspacePath, GlobalFileNames.experts)
 		if (!(await fileExistsAtPath(expertsDir))) {
 			return null
 		}
diff --git a/src/global-constants.ts b/src/global-constants.ts
@@ -5,4 +5,5 @@ export const GlobalFileNames = {
 	openRouterModels: "openrouter_models.json",
 	mcpSettings: "hai_mcp_settings.json",
 	clineRules: ".hairules",
+	experts: ".hai-experts",
 }
diff --git a/src/integrations/workspace/HaiFileSystemWatcher.ts b/src/integrations/workspace/HaiFileSystemWatcher.ts
@@ -72,6 +72,11 @@ class HaiFileSystemWatcher {
 				this.providerRef.deref()?.updateHaiRulesState(true)
 			}
 
+			// Check for the experts
+			if (filePath.includes(GlobalFileNames.experts)) {
+				this.providerRef.deref()?.loadExperts()
+			}
+
 			this.providerRef.deref()?.invokeReindex([filePath], FileOperations.Delete)
 		})
 
@@ -83,11 +88,20 @@ class HaiFileSystemWatcher {
 				this.providerRef.deref()?.updateHaiRulesState(true)
 			}
 
+			// Check for the experts
+			if (filePath.includes(GlobalFileNames.experts)) {
+				this.providerRef.deref()?.loadExperts()
+			}
+
 			this.providerRef.deref()?.invokeReindex([filePath], FileOperations.Create)
 		})
 
 		this.watcher.on("change", (filePath) => {
 			console.log("HaiFileSystemWatcher File changes", filePath)
+			// Check for the experts
+			if (filePath.includes(GlobalFileNames.experts)) {
+				this.providerRef.deref()?.loadExperts()
+			}
 			this.providerRef.deref()?.invokeReindex([filePath], FileOperations.Change)
 		})
 	}
diff --git a/src/utils/delete-helper.ts b/src/utils/delete-helper.ts
@@ -10,7 +10,9 @@ export async function deleteFromContextDirectory(filePaths: string[], srcFolder:
 	// Delete files from context directory
 	for (const filePath of filePaths) {
 		const destinationFilePath = filePath.replace(srcFolder, destinationFolderPath)
-		rmSync(destinationFilePath, { recursive: true })
+		if (existsSync(destinationFilePath)) {
+			rmSync(destinationFilePath, { recursive: true })
+		}
 	}
 
 	// Handle hash file updates
diff --git a/webview-ui/src/components/experts/ExpertsView.tsx b/webview-ui/src/components/experts/ExpertsView.tsx
@@ -4,6 +4,7 @@ import { VSCodeButton, VSCodeTextField, VSCodeTextArea } from "@vscode/webview-u
 import { vscode } from "../../utils/vscode"
 import { DEFAULT_EXPERTS } from "../../data/defaultExperts"
 import { ExpertData } from "../../types/experts"
+import { useExtensionState } from "../../context/ExtensionStateContext"
 
 interface ExpertsViewProps {
 	onDone: () => void
@@ -18,6 +19,7 @@ const ExpertsView: React.FC<ExpertsViewProps> = ({ onDone }) => {
 	const [isFormReadOnly, setIsFormReadOnly] = useState(false)
 	const [nameError, setNameError] = useState<string | null>(null)
 	const [expertInDeleteConfirmation, setExpertInDeleteConfirmation] = useState<string | null>(null)
+	const { vscodeWorkspacePath } = useExtensionState()
 
 	// Create a reference to the file input element
 	const fileInputRef = React.useRef<HTMLInputElement>(null)
@@ -363,64 +365,84 @@ const ExpertsView: React.FC<ExpertsViewProps> = ({ onDone }) => {
 				</Section>
 
 				{/* Add/Edit Form Section */}
-				<Section>
-					<SectionHeader>Add New Expert</SectionHeader>
-					<FormContainer>
-						<FormGroup>
-							<label htmlFor="expert-name">Name</label>
-							<VSCodeTextField
-								id="expert-name"
-								value={newExpertName}
-								onChange={(e) => setNewExpertName((e.target as HTMLInputElement).value)}
-								placeholder="Expert Name"
-								style={{ width: "100%" }}
-								disabled={isFormReadOnly}
-							/>
-							{nameError && (
-								<p style={{ color: "var(--vscode-errorForeground)", fontSize: "12px", marginTop: "4px" }}>
-									{nameError}
-								</p>
-							)}
-						</FormGroup>
-
-						<FormGroup>
-							<label htmlFor="expert-prompt">GuideLines</label>
-							<VSCodeTextArea
-								id="expert-prompt"
-								value={newExpertPrompt}
-								onChange={(e) => setNewExpertPrompt((e.target as HTMLTextAreaElement).value)}
-								placeholder="Enter Expert Guidelines"
-								resize="vertical"
-								rows={6}
-								disabled={isFormReadOnly}
-								style={{ width: "100%" }}
-							/>
-							<p className="description-text">
-								These guidelines will override the default HAI guidelines when this expert is selected.
-							</p>
-						</FormGroup>
-
-						{!isFormReadOnly && (
+
+				{vscodeWorkspacePath ? (
+					<Section>
+						<SectionHeader>Add New Expert</SectionHeader>
+						<FormContainer>
 							<FormGroup>
-								<VSCodeButton appearance="secondary" onClick={handleFileUpload}>
-									<span className="codicon codicon-cloud-upload" style={{ marginRight: "5px" }}></span>
-									Upload Guidelines File (.md only)
-								</VSCodeButton>
+								<label htmlFor="expert-name">Name</label>
+								<VSCodeTextField
+									id="expert-name"
+									value={newExpertName}
+									onChange={(e) => setNewExpertName((e.target as HTMLInputElement).value)}
+									placeholder="Expert Name"
+									style={{ width: "100%" }}
+									disabled={isFormReadOnly}
+								/>
+								{nameError && (
+									<p style={{ color: "var(--vscode-errorForeground)", fontSize: "12px", marginTop: "4px" }}>
+										{nameError}
+									</p>
+								)}
 							</FormGroup>
-						)}
-
-						{!isFormReadOnly && (
-							<ActionButtons>
-								<VSCodeButton appearance="secondary" onClick={resetForm}>
-									Cancel
-								</VSCodeButton>
-								<VSCodeButton appearance="primary" onClick={handleSaveExpert}>
-									Save
-								</VSCodeButton>
-							</ActionButtons>
-						)}
-					</FormContainer>
-				</Section>
+
+							<FormGroup>
+								<label htmlFor="expert-prompt">Guidelines</label>
+								<VSCodeTextArea
+									id="expert-prompt"
+									value={newExpertPrompt}
+									onChange={(e) => setNewExpertPrompt((e.target as HTMLTextAreaElement).value)}
+									placeholder="Enter Expert Guidelines"
+									resize="vertical"
+									rows={6}
+									disabled={isFormReadOnly}
+									style={{ width: "100%" }}
+								/>
+								<p className="description-text">
+									These guidelines will override the default HAI guidelines when this expert is selected.
+								</p>
+							</FormGroup>
+
+							{!isFormReadOnly && (
+								<FormGroup>
+									<VSCodeButton appearance="secondary" onClick={handleFileUpload}>
+										<span className="codicon codicon-cloud-upload" style={{ marginRight: "5px" }}></span>
+										Upload Guidelines File (.md only)
+									</VSCodeButton>
+								</FormGroup>
+							)}
+
+							{!isFormReadOnly && (
+								<ActionButtons>
+									<VSCodeButton appearance="secondary" onClick={resetForm}>
+										Cancel
+									</VSCodeButton>
+									<VSCodeButton appearance="primary" onClick={handleSaveExpert}>
+										Save
+									</VSCodeButton>
+								</ActionButtons>
+							)}
+						</FormContainer>
+					</Section>
+				) : (
+					<Section>
+						<SectionHeader>Add New Expert</SectionHeader>
+						<EmptyState>
+							<div
+								style={{
+									display: "flex",
+									alignItems: "center",
+									gap: "8px",
+									color: "var(--vscode-editorWarning-foreground)",
+									fontSize: "11px",
+								}}>
+								<i className="codicon codicon-warning" />
+								<span>Workspace is not available. Please open a workspace to add new experts.</span>
+							</div>
+						</EmptyState>
+					</Section>
+				)}
 			</Content>
 		</Container>
 	)
diff --git a/webview-ui/src/types/experts.ts b/webview-ui/src/types/experts.ts
diff --git a/webview-ui/src/utils/add-highlighting.ts b/webview-ui/src/utils/add-highlighting.ts

Original file line number	Diff line number	Diff line change
`@@ -5,4 +5,5 @@ export const GlobalFileNames = {`
`5`	`5`	`openRouterModels: "openrouter_models.json",`
`6`	`6`	`mcpSettings: "hai_mcp_settings.json",`
`7`	`7`	`clineRules: ".hairules",`
	`8`	`+ experts: ".hai-experts",`
`8`	`9`	`}`