Merge branch 'presidio-oss:main' into document-update/readme

Author: magesh-presidio

.changeset/lovely-avocados-do.md

@@ -0,0 +1,5 @@
+---
+"hai-build-code-generator": minor
+---
+
+Marking the Hai tasks as 'Completed' upon successful execution

.changeset/sharp-eels-accept.md

@@ -0,0 +1,5 @@
+---
+"hai-build-code-generator": patch
+---
+
+Fixed inline edit not working after cline latest merge (v3.8.6)

.vscodeignore

@@ -45,6 +45,9 @@ docs/**
 !node_modules/@vscode/codicons/dist/codicon.css
 !node_modules/@vscode/codicons/dist/codicon.ttf
 
+#Include default experts folder
+!src/experts
+
 # Include default themes JSON files used in getTheme
 !src/integrations/theme/default-themes/**
 

src/core/controller/index.ts

@@ -826,6 +826,9 @@ export class Controller {
 			case "loadExperts":
 				await this.loadExperts()
 				break
+			case "loadDefaultExperts":
+				await this.loadDefaultExperts()
+				break
 			case "refreshDocumentLink":
 				if (message.text && message.expert) {
 					await this.expertManager.refreshDocumentLink(this.vsCodeWorkSpaceFolderFsPath, message.expert, message.text)
@@ -962,6 +965,44 @@ export class Controller {
 					break
 				}
 				break
+			case "writeTaskStatus":
+				// write status to the file
+				const folder = message.folder
+				const taskId = message?.taskId ?? ""
+				const status = message?.status
+				const taskIdMatch = taskId.match(/^(\d+)-US(\d+)-TASK(\d+)$/)
+				if (!folder || !taskIdMatch || !status) {
+					const message = `Failed to update task status. Error: Either folder, taskId or status is invalid.`
+					vscode.window.showErrorMessage(message)
+				} else {
+					const [_, prdId, usId, taskId] = taskIdMatch
+					const prdFeatureFilePath = path.join(`${folder}`, "PRD", `PRD${prdId}-feature.json`)
+					try {
+						const fileContent = await fs.readFile(prdFeatureFilePath, "utf-8")
+						const prdFeatureJson = JSON.parse(fileContent)
+						const feature = prdFeatureJson["features"].find((feature: { id: string }) => feature.id === `US${usId}`)
+						if (feature) {
+							const selectedTask = feature["tasks"].find((task: { id: string }) => task.id === `TASK${taskId}`)
+							selectedTask.status = status
+						}
+
+						await fs.writeFile(prdFeatureFilePath, JSON.stringify(prdFeatureJson, null, 2), "utf-8")
+						const message = `Successfully marked task as ${status.toLowerCase()}.`
+						vscode.window.showInformationMessage(message)
+						await this.postMessageToWebview({
+							type: "writeTaskStatus",
+							writeTaskStatusResult: {
+								success: true,
+								message,
+								status,
+							},
+						})
+					} catch (error) {
+						const message = `Failed to mark task as ${status.toLowerCase()}. Error: ${error.message}`
+						vscode.window.showErrorMessage(message)
+					}
+				}
+				break
 			default:
 				this.customWebViewMessageHandlers(message)
 				break
@@ -2457,7 +2498,13 @@ Here is the project's README to help you get started:\n\n${mcpDetails.readmeCont
 				.filter((file: string) => file.match(/\-feature.json$/))
 				.forEach((file: string) => {
 					const content = fs.readFileSync(path.join(`${url}/PRD`, file), "utf-8")
-					haiTaskList = [...haiTaskList, ...JSON.parse(content).features]
+					const prdId = file.split("-")[0].replace("PRD", "")
+					const parsedFeaturesList = JSON.parse(content).features
+					const featuresListWithPrdId = parsedFeaturesList.map((feature: any) => ({
+						...feature,
+						prdId: prdId,
+					}))
+					haiTaskList = [...haiTaskList, ...featuresListWithPrdId]
 				})
 			return haiTaskList
 		} catch (e) {
@@ -2570,6 +2617,14 @@ Here is the project's README to help you get started:\n\n${mcpDetails.readmeCont
 		})
 	}
 
+	async loadDefaultExperts() {
+		const experts = await this.expertManager.loadDefaultExperts()
+		await this.postMessageToWebview({
+			type: "defaultExpertsLoaded",
+			experts,
+		})
+	}
+
 	private async getExpertDocumentsContent(expertName: string): Promise<string> {
 		const expertPath = await this.expertManager.getExpertPromptPath(this.vsCodeWorkSpaceFolderFsPath, expertName)
 

src/core/experts/ExpertManager.ts

@@ -17,6 +17,7 @@ export class ExpertManager {
 
 	public static readonly METADATA_FILE = "metadata.json"
 	public static readonly PROMPT_FILE = "prompt.md"
+	public static readonly ICON = "icon.svg"
 	public static readonly DOCS_DIR = "docs"
 	public static readonly STATUS_FILE = "status.json"
 	public static readonly PLACEHOLDER_FILE = "placeholder.txt"
@@ -507,4 +508,60 @@ export class ExpertManager {
 		}
 		return content
 	}
+
+	/**
+	 * Load the default Experts
+	 */
+
+	async loadDefaultExperts(): Promise<ExpertData[]> {
+		const expertsDir = path.join(this.extensionContext.extensionPath, GlobalFileNames.defaultExperts)
+
+		let experts: ExpertData[] = []
+
+		try {
+			const directoryEntries = await fs.readdir(expertsDir, { withFileTypes: true })
+
+			for (const directoryEntry of directoryEntries) {
+				if (!directoryEntry.isDirectory()) {
+					continue
+				}
+
+				const folderName = directoryEntry.name
+				const folderPath = path.join(expertsDir, folderName)
+				const promptPath = path.join(folderPath, ExpertManager.PROMPT_FILE)
+				const iconPath = path.join(folderPath, ExpertManager.ICON)
+
+				let prompt = ""
+				try {
+					prompt = await fs.readFile(promptPath, "utf8")
+					if (!prompt.trim()) {
+						console.warn(`Empty prompt for ${folderName}, skipping...`)
+						continue
+					}
+				} catch (error) {
+					console.error(`Error reading prompt for ${folderName}:`, error)
+					continue
+				}
+
+				let iconBase64 = ""
+				try {
+					const svgContent = await fs.readFile(iconPath)
+					iconBase64 = `data:image/svg+xml;base64,${svgContent.toString("base64")}`
+				} catch {
+					console.warn(`Icon not found for ${folderName}`)
+				}
+
+				experts.push({
+					name: folderName,
+					prompt,
+					isDefault: true,
+					iconComponent: iconBase64,
+				})
+			}
+		} catch (error) {
+			console.error("Error reading experts directory:", error)
+		}
+
+		return experts
+	}
 }

…ew-ui/src/assets/experts-icon/dotnet.svg src/experts/dotnet/icon.svgwebview-ui/src/assets/experts-icon/dotnet.svg renamed to src/experts/dotnet/icon.svg webview-ui/src/assets/experts-icon/dotnet.svg renamed to src/experts/dotnet/icon.svg

@@ -1,4 +1,3 @@
-export const DOTNET_EXPERT_PROMPT = `
 ## You are HAI , a specialized expert in .NET development with deep knowledge of the entire .NET ecosystem . 
 
 ## .NET-Specific Rules
@@ -61,5 +60,4 @@ Ensure **separation of concerns** (Application, Domain, Infrastructure, API).
 ### 10. Performance & Best Practices  
 - Use **async/await** for non-blocking operations.  
 - Implement caching (e.g., **MemoryCache, Redis**) for frequently accessed data.  
-- Enforce **rate limiting** and **API throttling**.  
-`
+- Enforce **rate limiting** and **API throttling**. 

…view-ui/src/data/experts/dotnetExpert.ts src/experts/dotnet/prompt.mdwebview-ui/src/data/experts/dotnetExpert.ts renamed to src/experts/dotnet/prompt.md webview-ui/src/data/experts/dotnetExpert.ts renamed to src/experts/dotnet/prompt.md

@@ -1,4 +1,3 @@
-export const GOLANG_EXPERT_PROMPT = `
 ## You are HAI, a specialized expert in Go development with deep knowledge of idiomatic Go programming and the Go ecosystem.
 
 ## Go-Specific Rules
@@ -99,5 +98,4 @@ Ensure **package cohesion** (each package serves a single purpose).
 - Use **prepared statements** for database queries.  
 - Apply **proper authentication** and authorization.  
 - Handle **sensitive data** carefully; don't log credentials.  
-- Run **security scanners** on your dependencies.  
-`
+- Run **security scanners** on your dependencies.