Merge pull request wso2#874 from madushajg/bi-multi-project

madushajg · web-flow · commit 5289af962e13 · 2025-11-10T23:33:48.000+05:30
Improve detecting project path in AI panel
diff --git a/workspaces/ballerina/ballerina-extension/package.json b/workspaces/ballerina/ballerina-extension/package.json
@@ -689,7 +689,7 @@
             },
             {
                 "command": "BI.project-explorer.add",
-                "title": "Add Construct",
+                "title": "Add Project",
                 "icon": "$(add)",
                 "group": "navigation",
                 "category": "BI"
diff --git a/workspaces/ballerina/ballerina-extension/src/features/ai/service/documentation/doc_generator.ts b/workspaces/ballerina/ballerina-extension/src/features/ai/service/documentation/doc_generator.ts
@@ -20,13 +20,13 @@ import { DocGenerationRequest } from '@wso2/ballerina-core';
 import { getServiceDeclaration } from '../../testGenerator';
 import { generateDocumentation, DocumentationGenerationRequest } from './documentation';
 import { getProjectSource, getOpenAPISpecification } from '../../utils';
-import { StateMachine } from '../../../../stateMachine';
+import { getCurrentProjectRoot } from '../../../../utils/project-utils';
 
 // Main documentation generator function that handles all the logic
 export async function generateDocumentationForService(params: DocGenerationRequest): Promise<void> {
     try {
         // Get the project root
-        const projectPath = StateMachine.context().projectPath;
+        const projectPath = await getCurrentProjectRoot();
 
         // Get the project source files
         const projectSource = await getProjectSource(projectPath);
diff --git a/workspaces/ballerina/ballerina-extension/src/features/ai/service/test/function_tests.ts b/workspaces/ballerina/ballerina-extension/src/features/ai/service/test/function_tests.ts
@@ -20,7 +20,7 @@ import { generateTest, getDiagnostics } from "../../testGenerator";
 import { URI } from "vscode-uri";
 import * as fs from "fs";
 import { CopilotEventHandler, createWebviewEventHandler } from "../event";
-import { StateMachine } from "../../../../stateMachine";
+import { getCurrentProjectRoot } from "../../../../utils/project-utils";
 
 // Core function test generation that emits events
 export async function generateFunctionTestsCore(
@@ -39,7 +39,15 @@ export async function generateFunctionTestsCore(
         content: `\n\n<progress>Generating tests for the function ${functionIdentifier}. This may take a moment.</progress>`,
     });
 
-    const projectPath = StateMachine.context().projectPath;
+    let projectPath: string;
+    try {
+        projectPath = await getCurrentProjectRoot();
+    } catch (error) {
+        console.error("Error getting current project root:", error);
+        eventHandler({ type: "error", content: getErrorMessage(error) });
+        return;
+    }
+
     const response = await generateTest(projectPath, {
         targetType: TestGenerationTarget.Function,
         targetIdentifier: functionIdentifier,
diff --git a/workspaces/ballerina/ballerina-extension/src/features/ai/service/test/test_plan.ts b/workspaces/ballerina/ballerina-extension/src/features/ai/service/test/test_plan.ts
@@ -21,7 +21,7 @@ import { TestGenerationTarget, TestPlanGenerationRequest, Command } from "@wso2/
 import { generateTest, getDiagnostics } from "../../testGenerator";
 import { CopilotEventHandler, createWebviewEventHandler } from "../event";
 import { AIPanelAbortController } from "../../../../../src/rpc-managers/ai-panel/utils";
-import { StateMachine } from "../../../../stateMachine";
+import { getCurrentProjectRoot } from "../../../../utils/project-utils";
 
 export interface TestPlanResponse {
     testPlan: string;
@@ -168,7 +168,14 @@ export async function generateTestPlanCore(
                         type: "content_block",
                         content: `\n\n<progress>Generating tests for the ${target} service. This may take a moment.</progress>`,
                     });
-                    const projectPath = StateMachine.context().projectPath;
+                    let projectPath: string;
+                    try {
+                        projectPath = await getCurrentProjectRoot();
+                    } catch (error) {
+                        console.error("Error getting current project root:", error);
+                        eventHandler({ type: "error", content: getErrorMessage(error) });
+                        return;
+                    }
                     const testResp = await generateTest(projectPath, {
                         targetType: TestGenerationTarget.Service,
                         targetIdentifier: target,
diff --git a/workspaces/ballerina/ballerina-extension/src/features/ai/testGenerator.ts b/workspaces/ballerina/ballerina-extension/src/features/ai/testGenerator.ts
@@ -28,7 +28,6 @@ import * as os from 'os';
 import { writeBallerinaFileDidOpenTemp } from '../../utils/modification';
 import { closeAllBallerinaFiles } from './utils';
 import { generateTestFromLLM, TestGenerationRequest1 } from './service/test/test';
-import { findBallerinaPackageRoot } from '../../utils';
 
 const TEST_GEN_REQUEST_TIMEOUT = 100000;
 
@@ -220,10 +219,9 @@ export async function getResourceAccessorDef(projectRoot: string, resourceMethod
 }
 
 export async function getDiagnostics(
-    projectRoot: string,
+    ballerinaProjectRoot: string,
     generatedTestSource: TestGenerationResponse
 ): Promise<ProjectDiagnostics> {
-    const ballerinaProjectRoot = await findBallerinaPackageRoot(projectRoot);
     const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'temp-bal-test-gen-'));
     fs.cpSync(ballerinaProjectRoot, tempDir, { recursive: true });
     const tempTestFolderPath = path.join(tempDir, 'tests');
@@ -245,12 +243,7 @@ export async function getDiagnostics(
     };
 }
 
-async function getProjectSource(dirPath: string): Promise<ProjectSource | null> {
-    const projectRoot = await findBallerinaPackageRoot(dirPath);
-
-    if (!projectRoot) {
-        return null;
-    }
+async function getProjectSource(projectRoot: string): Promise<ProjectSource | null> {
 
     const projectSource: ProjectSource = {
         sourceFiles: [],
@@ -298,14 +291,9 @@ async function getProjectSource(dirPath: string): Promise<ProjectSource | null>
     return projectSource;
 }
 
-async function getProjectSourceWithTests(dirPath: string): Promise<ProjectSource | null> {
-    const projectRoot = await findBallerinaPackageRoot(dirPath);
-
-    if (!projectRoot) {
-        return null;
-    }
+async function getProjectSourceWithTests(projectRoot: string): Promise<ProjectSource | null> {
 
-    const projectSourceWithTests: ProjectSource = await getProjectSource(dirPath);
+    const projectSourceWithTests: ProjectSource = await getProjectSource(projectRoot);
 
     // Read tests
     const testsDir = path.join(projectRoot, 'tests');
diff --git a/workspaces/ballerina/ballerina-extension/src/features/ai/utils.ts b/workspaces/ballerina/ballerina-extension/src/features/ai/utils.ts
@@ -278,17 +278,11 @@ async function showNoBallerinaSourceWarningMessage() {
 
 import { ProjectSource, ProjectModule, OpenAPISpec } from '@wso2/ballerina-core';
 import { langClient } from './activator';
-import { findBallerinaPackageRoot } from '../../utils';
 
 /**
  * Gets the project source including all .bal files and modules
  */
-export async function getProjectSource(dirPath: string): Promise<ProjectSource | null> {
-    const projectRoot = await findBallerinaPackageRoot(dirPath);
-
-    if (!projectRoot) {
-        return null;
-    }
+export async function getProjectSource(projectRoot: string): Promise<ProjectSource | null> {
 
     const projectSource: ProjectSource = {
         sourceFiles: [],
@@ -339,14 +333,9 @@ export async function getProjectSource(dirPath: string): Promise<ProjectSource |
 /**
  * Gets the project source including test files
  */
-export async function getProjectSourceWithTests(dirPath: string): Promise<ProjectSource | null> {
-    const projectRoot = await findBallerinaPackageRoot(dirPath);
-
-    if (!projectRoot) {
-        return null;
-    }
+export async function getProjectSourceWithTests(projectRoot: string): Promise<ProjectSource | null> {
 
-    const projectSourceWithTests: ProjectSource = await getProjectSource(dirPath);
+    const projectSourceWithTests: ProjectSource = await getProjectSource(projectRoot);
 
     // Read tests
     const testsDir = path.join(projectRoot, 'tests');
diff --git a/workspaces/ballerina/ballerina-extension/src/stateMachine.ts b/workspaces/ballerina/ballerina-extension/src/stateMachine.ts
@@ -879,6 +879,13 @@ async function handleSingleWorkspaceFolder(workspaceURI: Uri, isSwitching: boole
             targetPackage = packages[0];
         }
 
+        if (!targetPackage && packages.length > 1) {
+            // If the user has not selected a package, select the first package
+            // This is a temporary solution until we provide the support for multi root workspaces
+            // Ref: https://github.com/wso2/product-ballerina-integrator/issues/1465
+            targetPackage = packages[0];
+        }
+
         if (targetPackage) {
             const packagePath = path.isAbsolute(targetPackage)
                 ? targetPackage

Original file line number	Diff line number	Diff line change
`@@ -689,7 +689,7 @@`
`689`	`689`	`},`
`690`	`690`	`{`
`691`	`691`	`"command": "BI.project-explorer.add",`
`692`		`- "title": "Add Construct",`
	`692`	`+ "title": "Add Project",`
`693`	`693`	`"icon": "$(add)",`
`694`	`694`	`"group": "navigation",`
`695`	`695`	`"category": "BI"`