wso2 · madushajg · Nov 11, 2025 · Oct 9, 2025 · Oct 10, 2025 · Oct 10, 2025
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -352,7 +352,7 @@ jobs:
         uses: actions/download-artifact@v4
         continue-on-error: true
         with:
-          name: ${{ matrix.name }}-e2e-test-results-${{ matrix.group }}-${{ env.PREVIOUS_ATTEMPT }}
+          name: ${{ matrix.name }}-e2e-test-results-${{ matrix.os }}-${{ matrix.group }}-${{ env.PREVIOUS_ATTEMPT }}
           path: workspaces/${{ matrix.path }}/test-results
 
       - name: install packages
@@ -413,7 +413,7 @@ jobs:
         uses: actions/upload-artifact@v4
         if: always()
         with:
-          name: ${{ matrix.name }}I-e2e-test-results-${{ matrix.os }}-${{ matrix.group }}-${{ github.run_attempt }}
+          name: ${{ matrix.name }}-e2e-test-results-${{ matrix.os }}-${{ matrix.group }}-${{ github.run_attempt }}
           path: workspaces/${{ matrix.path }}/test-results/**
           retention-days: 5
           include-hidden-files: true

diff --git a/common/config/rush/.pnpmfile.cjs b/common/config/rush/.pnpmfile.cjs
@@ -57,6 +57,9 @@ module.exports = {
         if (pkg.dependencies['form-data']) {
           pkg.dependencies['form-data'] = '^4.0.4';
         }
+        if (pkg.dependencies['min-document']) {
+          pkg.dependencies['min-document'] = '^2.19.1';
+        }
       }
 
       if (pkg.devDependencies) {
@@ -97,6 +100,9 @@ module.exports = {
         if (pkg.devDependencies['form-data']) {
           pkg.devDependencies['form-data'] = '^4.0.4';
         }
+        if (pkg.devDependencies['min-document']) {
+          pkg.devDependencies['min-document'] = '^2.19.1';
+        }
       }
 
       return pkg;

diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml
diff --git a/rush.json b/rush.json
@@ -237,9 +237,7 @@
      * The list of shell commands to run before the Rush build command starts
      */
     "preRushBuild": [
-      "npm run init-submodules",
-      "cd workspaces/mi/mi-extension && pnpm run download-ls",
-      "cd workspaces/ballerina/ballerina-extension && pnpm run download-ls"
+      "npm run init-submodules"
     ],
     /**
     * The list of shell commands to run after the Rush build command finishes

diff --git a/workspaces/ballerina/ballerina-core/src/interfaces/extended-lang-client.ts b/workspaces/ballerina/ballerina-core/src/interfaces/extended-lang-client.ts
@@ -568,7 +568,7 @@ export interface ExecutorPositions {
 // Test Manager related interfaces 
 
 export interface TestsDiscoveryRequest {
-    filePath: string;
+    projectPath: string;
 }
 
 export interface TestsDiscoveryResponse {

diff --git a/workspaces/ballerina/ballerina-core/src/rpc-types/bi-diagram/index.ts b/workspaces/ballerina/ballerina-core/src/rpc-types/bi-diagram/index.ts
@@ -118,7 +118,8 @@ import {
     RecordsInWorkspaceMentions,
     BuildMode,
     DevantMetadata,
-    GeneratedClientSaveResponse
+    GeneratedClientSaveResponse,
+    AddProjectToWorkspaceRequest
 } from "./interfaces";
 
 export interface BIDiagramAPI {
@@ -137,6 +138,7 @@ export interface BIDiagramAPI {
     getNodeTemplate: (params: BINodeTemplateRequest) => Promise<BINodeTemplateResponse>;
     getAiSuggestions: (params: BIAiSuggestionsRequest) => Promise<BIAiSuggestionsResponse>;
     createProject: (params: ProjectRequest) => void;
+    addProjectToWorkspace: (params: AddProjectToWorkspaceRequest) => void;
     getWorkspaces: () => Promise<WorkspacesResponse>;
     getProjectStructure: () => Promise<ProjectStructureResponse>;
     getProjectComponents: () => Promise<ProjectComponentsResponse>;

diff --git a/workspaces/ballerina/ballerina-core/src/rpc-types/bi-diagram/interfaces.ts b/workspaces/ballerina/ballerina-core/src/rpc-types/bi-diagram/interfaces.ts
@@ -27,6 +27,18 @@ export interface ProjectRequest {
     packageName: string;
     projectPath: string;
     createDirectory: boolean;
+    createAsWorkspace?: boolean;
+    workspaceName?: string;
+    orgName?: string;
+    version?: string;
+}
+
+export interface AddProjectToWorkspaceRequest {
+    projectName: string;
+    packageName: string;
+    path: string;
+    convertToWorkspace?: boolean;
+    workspaceName?: string;
     orgName?: string;
     version?: string;
 }

diff --git a/workspaces/ballerina/ballerina-core/src/rpc-types/bi-diagram/rpc-type.ts b/workspaces/ballerina/ballerina-core/src/rpc-types/bi-diagram/rpc-type.ts
@@ -120,7 +120,8 @@ import {
     RecordsInWorkspaceMentions,
     BuildMode,
     DevantMetadata,
-    GeneratedClientSaveResponse
+    GeneratedClientSaveResponse,
+    AddProjectToWorkspaceRequest
 } from "./interfaces";
 import { RequestType, NotificationType } from "vscode-messenger-common";
 
@@ -140,6 +141,7 @@ export const getEnclosedFunction: RequestType<BIGetEnclosedFunctionRequest, BIGe
 export const getNodeTemplate: RequestType<BINodeTemplateRequest, BINodeTemplateResponse> = { method: `${_preFix}/getNodeTemplate` };
 export const getAiSuggestions: RequestType<BIAiSuggestionsRequest, BIAiSuggestionsResponse> = { method: `${_preFix}/getAiSuggestions` };
 export const createProject: NotificationType<ProjectRequest> = { method: `${_preFix}/createProject` };
+export const addProjectToWorkspace: NotificationType<AddProjectToWorkspaceRequest> = { method: `${_preFix}/addProjectToWorkspace` };
 export const getWorkspaces: RequestType<void, WorkspacesResponse> = { method: `${_preFix}/getWorkspaces` };
 export const getProjectStructure: RequestType<void, ProjectStructureResponse> = { method: `${_preFix}/getProjectStructure` };
 export const getProjectComponents: RequestType<void, ProjectComponentsResponse> = { method: `${_preFix}/getProjectComponents` };

diff --git a/workspaces/ballerina/ballerina-core/src/state-machine-types.ts b/workspaces/ballerina/ballerina-core/src/state-machine-types.ts
@@ -77,6 +77,7 @@ export enum MACHINE_VIEW {
     BIWelcome = "BI Welcome",
     BIProjectForm = "BI Project SKIP",
     BIImportIntegration = "BI Import Integration SKIP",
+    BIAddProjectForm = "BI Add Project SKIP",
     BIComponentView = "BI Component View",
     AddConnectionWizard = "Add Connection Wizard",
     AddCustomConnector = "Add Custom Connector",
@@ -120,7 +121,8 @@ export type FocusFlowDiagramView = typeof FOCUS_FLOW_DIAGRAM_VIEW[keyof typeof F
 export interface VisualizerLocation {
     view?: MACHINE_VIEW | null;
     documentUri?: string;
-    projectUri?: string;
+    projectPath?: string;
+    workspacePath?: string;
     identifier?: string;
     parentIdentifier?: string;
     artifactType?: DIRECTORY_MAP;

diff --git a/workspaces/ballerina/ballerina-extension/CHANGELOG.md b/workspaces/ballerina/ballerina-extension/CHANGELOG.md
@@ -4,11 +4,11 @@ All notable changes to the **Ballerina** extension will be documented in this fi
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/) and this project adheres to [Semantic Versioning](https://semver.org/).
 
-## [Unreleased]
+## [5.6.0](https://github.com/wso2/vscode-extensions/compare/ballerina-integrator-1.4.0...ballerina-integrator-1.5.0) - 2025-11-11
 
 ### Added
 
-- **Editor** — Added visual editing for mono-repositories with multiple Ballerina projects, along with support for "Natural expressions" in Ballerina 2201.13.0.
+- **Editor** — Added support for [Ballerina workspaces](https://ballerina.io/learn/workspaces/). This allows you to seamlessly manage, navigate, and build multiple related Ballerina projects within a single VS Code window, greatly improving the development workflow for complex systems.
 
 ## [5.5.0](https://github.com/wso2/vscode-extensions/compare/ballerina-integrator-1.3.2...ballerina-integrator-1.4.0) - 2025-11-05
 

diff --git a/workspaces/ballerina/ballerina-extension/package.json b/workspaces/ballerina/ballerina-extension/package.json
@@ -2,7 +2,7 @@
     "name": "ballerina",
     "displayName": "Ballerina",
     "description": "Ballerina Language support, debugging, graphical visualization, AI-based data-mapping and many more.",
-    "version": "5.5.0",
+    "version": "5.6.0",
     "publisher": "wso2",
     "icon": "resources/images/ballerina.png",
     "homepage": "https://wso2.com/ballerina/vscode/docs",
@@ -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/scripts/download-ls.js b/workspaces/ballerina/ballerina-extension/scripts/download-ls.js
@@ -100,7 +100,6 @@ function downloadFile(url, outputPath, maxRedirects = 5) {
                         return;
                     }
 
-                    console.log(`Following redirect to: ${res.headers.location}`);
                     makeRequest(res.headers.location, redirectCount + 1);
                     return;
                 }

diff --git a/workspaces/ballerina/ballerina-extension/src/RPCLayer.ts b/workspaces/ballerina/ballerina-extension/src/RPCLayer.ts
@@ -130,7 +130,7 @@ async function getContext(): Promise<VisualizerLocation> {
             position: context.position,
             syntaxTree: context.syntaxTree,
             isBI: context.isBI,
-            projectUri: context.projectUri,
+            projectPath: context.projectPath,
             serviceType: context.serviceType,
             type: context.type,
             isGraphql: context.isGraphql,
@@ -140,7 +140,7 @@ async function getContext(): Promise<VisualizerLocation> {
             metadata: {
                 isBISupported: context.isBISupported,
                 haveLS: StateMachine.langClient() && true,
-                recordFilePath: path.join(context.projectUri, "types.bal"),
+                recordFilePath: path.join(context.projectPath, "types.bal"),
                 enableSequenceDiagram: extension.ballerinaExtInstance.enableSequenceDiagramView(),
                 target: context.metadata?.target
             },

diff --git a/workspaces/ballerina/ballerina-extension/src/core/extension.ts b/workspaces/ballerina/ballerina-extension/src/core/extension.ts
@@ -2346,13 +2346,11 @@ export class BallerinaExtension {
     public setPersistStatusContext(textEditor: TextEditor) {
         if (textEditor?.document) {
             const fileUri: Uri = textEditor.document.uri;
-            if (checkIsPersistModelFile(fileUri)) {
-                this.isPersist = true;
-                commands.executeCommand('setContext', 'isPersistModelActive', true);
-                return;
-            } else {
-                this.isPersist = false;
-            }
+            checkIsPersistModelFile(fileUri).then(isPersistModelFile => {
+                this.isPersist = isPersistModelFile;
+                commands.executeCommand('setContext', 'isPersistModelActive', isPersistModelFile);
+            });
+            return;
         }
         commands.executeCommand('setContext', 'isPersistModelActive', false);
     }

diff --git a/workspaces/ballerina/ballerina-extension/src/extension.ts b/workspaces/ballerina/ballerina-extension/src/extension.ts
@@ -115,7 +115,7 @@ export async function activate(context: ExtensionContext) {
     await StateMachine.initialize();
 
     // Then return the ballerina extension context
-    return { ballerinaExtInstance: extension.ballerinaExtInstance, projectPath: StateMachine.context().projectUri };
+    return { ballerinaExtInstance: extension.ballerinaExtInstance, projectPath: StateMachine.context().projectPath };
 }
 
 export async function activateBallerina(): Promise<BallerinaExtension> {

diff --git a/workspaces/ballerina/ballerina-extension/src/features/ai/activator.ts b/workspaces/ballerina/ballerina-extension/src/features/ai/activator.ts
@@ -86,7 +86,7 @@ export function activateAIFeatures(ballerinaExternalInstance: BallerinaExtension
         });
     }
 
-    const projectPath = StateMachine.context().projectUri;
+    const projectPath = StateMachine.context().projectPath;
 
     commands.registerCommand(CONFIGURE_DEFAULT_MODEL_COMMAND, async (...args: any[]) => {
         const configPath = await getConfigFilePath(ballerinaExternalInstance, projectPath);

diff --git a/workspaces/ballerina/ballerina-extension/src/features/ai/dataMapping.ts b/workspaces/ballerina/ballerina-extension/src/features/ai/dataMapping.ts
@@ -210,7 +210,7 @@ async function createTempBallerinaFile(
 }
 
 export async function createTempBallerinaDir(): Promise<string> {
-  const projectRoot = StateMachine.context().projectUri;
+  const projectRoot = StateMachine.context().projectPath;
   const randomNum = Math.floor(Math.random() * 90000) + 10000;
   const tempDir = fs.mkdtempSync(
     path.join(os.tmpdir(), `ballerina-data-mapping-${randomNum}-`)

diff --git a/workspaces/ballerina/ballerina-extension/src/features/ai/service/datamapper/datamapper.ts b/workspaces/ballerina/ballerina-extension/src/features/ai/service/datamapper/datamapper.ts
@@ -260,7 +260,7 @@ export async function generateMappingCodeCore(mappingRequest: ProcessMappingPara
     const biDiagramRpcManager = new BiDiagramRpcManager();
     const langClient = StateMachine.langClient();
     const context = StateMachine.context();
-    const projectRoot = context.projectUri;
+    const projectRoot = context.projectPath;
 
     const targetFunctionName = mappingRequest.parameters.functionName;
 
@@ -443,9 +443,9 @@ export async function generateMappingCode(mappingRequest: ProcessMappingParamete
 }
 
 async function collectAllImportsFromProject(): Promise<ProjectImports> {
-    const projectUri = StateMachine.context().projectUri;
+    const projectPath = StateMachine.context().projectPath;
 
-    const ballerinaSourceFiles = await getBallerinaFiles(Uri.file(projectUri).fsPath);
+    const ballerinaSourceFiles = await getBallerinaFiles(Uri.file(projectPath).fsPath);
 
     const importStatements: ImportStatements[] = [];
 
@@ -457,7 +457,7 @@ async function collectAllImportsFromProject(): Promise<ProjectImports> {
     }
 
     return {
-        projectPath: projectUri,
+        projectPath: projectPath,
         imports: importStatements,
     };
 }
@@ -640,7 +640,7 @@ export async function generateInlineMappingCodeCore(inlineMappingRequest: Metada
 
     const langClient = StateMachine.langClient();
     const context = StateMachine.context();
-    const projectRoot = context.projectUri;
+    const projectRoot = context.projectPath;
 
     const inlineMappingsResult: InlineMappingsSourceResult =
         await generateInlineMappingsSource(inlineMappingRequest, langClient, context);

diff --git a/...aces/ballerina/ballerina-extension/src/features/ai/service/documentation/doc_generator.ts b/...aces/ballerina/ballerina-extension/src/features/ai/service/documentation/doc_generator.ts
@@ -20,22 +20,22 @@ 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 projectRoot = StateMachine.context().projectUri;
+        const projectPath = await getCurrentProjectRoot();
 
         // Get the project source files
-        const projectSource = await getProjectSource(projectRoot);
+        const projectSource = await getProjectSource(projectPath);
         if (!projectSource) {
             throw new Error("The current project is not recognized as a valid Ballerina project. Please ensure you have opened a Ballerina project.");
         }
 
         // Find the service declaration and get OpenAPI spec
-        const { serviceDocFilePath } = await getServiceDeclaration(projectRoot, params.serviceName);
+        const { serviceDocFilePath } = await getServiceDeclaration(projectPath, params.serviceName);
         const openApiSpec = await getOpenAPISpecification(serviceDocFilePath);
 
         // Create the documentation generation request

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,8 +39,16 @@ export async function generateFunctionTestsCore(
         content: `\n\n<progress>Generating tests for the function ${functionIdentifier}. This may take a moment.</progress>`,
     });
 
-    const projectRoot = StateMachine.context().projectUri;
-    const response = await generateTest(projectRoot, {
+    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,
         testPlan: params.testPlan,
@@ -63,7 +71,7 @@ export async function generateFunctionTestsCore(
         ? existingSource + "\n\n// >>>>>>>>>>>>>>TEST CASES NEED TO BE FIXED <<<<<<<<<<<<<<<\n\n" + response.testSource
         : response.testSource;
 
-    const diagnostics = await getDiagnostics(projectRoot, {
+    const diagnostics = await getDiagnostics(projectPath, {
         testSource: generatedFullSource,
     });
 
@@ -78,7 +86,7 @@ export async function generateFunctionTestsCore(
             content: `\n<progress>Refining tests based on feedback to ensure accuracy and reliability.</progress>`,
         });
 
-        const fixedCode = await generateTest(projectRoot, {
+        const fixedCode = await generateTest(projectPath, {
             targetType: TestGenerationTarget.Function,
             targetIdentifier: functionIdentifier,
             testPlan: params.testPlan,

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,8 +168,15 @@ export async function generateTestPlanCore(
                         type: "content_block",
                         content: `\n\n<progress>Generating tests for the ${target} service. This may take a moment.</progress>`,
                     });
-                    const projectRoot = StateMachine.context().projectUri;
-                    const testResp = await generateTest(projectRoot, {
+                    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,
                         testPlan: assistantResponse,
@@ -178,15 +185,15 @@ export async function generateTestPlanCore(
                         type: "content_block",
                         content: `\n<progress>Analyzing generated tests for potential issues.</progress>`,
                     });
-                    const diagnostics = await getDiagnostics(projectRoot, testResp);
+                    const diagnostics = await getDiagnostics(projectPath, testResp);
                     let testCode = testResp.testSource;
                     const testConfig = testResp.testConfig;
                     if (diagnostics.diagnostics.length > 0) {
                         eventHandler({
                             type: "content_block",
                             content: `\n<progress>Refining tests based on feedback to ensure accuracy and reliability.</progress>`,
                         });
-                        const fixedCode = await generateTest(projectRoot, {
+                        const fixedCode = await generateTest(projectPath, {
                             targetType: TestGenerationTarget.Service,
                             targetIdentifier: target,
                             testPlan: assistantResponse,
-Original file line number
+Diff line change
@@ Expand Up / @@ -100,7 +100,6 @@ function downloadFile(url, outputPath, maxRedirects = 5) { @@
                             return;
                         }
-                        console.log(`Following redirect to: ${res.headers.location}`);
                         makeRequest(res.headers.location, redirectCount + 1);
                         return;
                     }
@@ Expand Down @@