Run cbuild async

Author: edriouk

src/solutions/solution-converter.test.ts

@@ -208,6 +208,9 @@ describe('SolutionConverter', () => {
         expect(mockCsolutionService.convertSolution).toHaveBeenCalledTimes(1);
     });
     it('sends output to the output channel', async () => {
+        // Explicitly mock convertSolution to return success: true
+        mockCsolutionService.convertSolution.mockResolvedValue({ success: true });
+        mockCsolutionService.getLogMessages.mockResolvedValue({ errors: [], warnings: [], info: [], success: true });
         await fireAndWaitForConversion();
 
         const outputChannel = outputChannelProvider.mockGetCreatedChannelByName(manifest.CMSIS_SOLUTION_OUTPUT_CHANNEL);
@@ -216,9 +219,9 @@ describe('SolutionConverter', () => {
             expect.stringContaining('⚙️ Converting solution...'),
             expect.stringContaining('Check for missing packs...'),
             expect.stringContaining('Convert solution...'),
-            expect.stringContaining('Setup database...'),
             expect.stringContaining('Get log messages...'),
             expect.stringContaining('✅ Convert solution completed'),
+            expect.stringContaining('Setup database...'),
         ]);
         expect(completedListener).toHaveBeenCalledTimes(1);
     });
@@ -365,7 +368,7 @@ describe('SolutionConverter', () => {
 
     it('get cbuild west output and set diagnostics accordingly', async () => {
         mockCsolutionService.convertSolution.mockResolvedValue({ success: true });
-        mockCsolutionService.getLogMessages.mockResolvedValue({ success: true });
+        mockCsolutionService.getLogMessages.mockResolvedValue({ errors: [], warnings: [], info: [], success: true });
         let mockRunCbuildSetup = jest.spyOn(compileCommandsGenerator, 'runCbuildSetup').mockResolvedValue([true, [
             'warning cbuild: missing ZEPHYR_BASE environment variable',
             'error cbuild: exec: "west": executable file not found in $PATH',
@@ -377,23 +380,23 @@ describe('SolutionConverter', () => {
         jest.spyOn(vscodeUtils, 'getWorkspaceFolder').mockReturnValue('workspace/folder');
 
         await fireAndWaitForConversion();
-        await waitTimeout();
-        expect(mockRunCbuildSetup).toHaveBeenCalledTimes(1);
+
+        // Convert event should NOT have cbuild output (convert-only payload)
         expect(completedListener).toHaveBeenCalledTimes(1);
         expect(completedListener).toHaveBeenLastCalledWith(
             expect.objectContaining({
-                severity: 'error',
-                toolsOutputMessages: expect.arrayContaining([
-                    'warning cbuild: missing ZEPHYR_BASE environment variable',
-                    'error cbuild: exec: "west": executable file not found in $PATH',
-                ]),
+                severity: 'success',
+                toolsOutputMessages: [], // Convert-only, no cbuild output
             }),
         );
 
+        // Verify cbuild setup was called asynchronously (fire-and-forget pattern)
+        expect(mockRunCbuildSetup).toHaveBeenCalledTimes(1);
+
         // Remove settings.json
         completedListener.mockClear();
-        const settings = path.join(getWorkspaceFolder(), '.vscode', 'settings.json');
         mockRunCbuildSetup.mockClear();
+        const settings = path.join(getWorkspaceFolder(), '.vscode', 'settings.json');
         fsUtils.deleteFileIfExists(settings);
         await fireAndWaitForConversion();
         expect(mockRunCbuildSetup).toHaveBeenCalledTimes(1);

src/solutions/solution-converter.ts

@@ -173,13 +173,6 @@ export class SolutionConverterImpl implements SolutionConverter {
 
         let logResult = undefined;
         if (!detection) {
-            if (convertResult.success) {
-                // check if compile commands need to be updated: call cbuild setup skipping csolution convert step
-                outputChannel.append('Setup database... ');
-                let cbuildOutput = undefined;
-                [convertResult.success, cbuildOutput] = await this.compileCommandsGenerator.runCbuildSetup();
-                toolsOutputMessages = toolsOutputMessages.concat(cbuildOutput ?? []);
-            }
             // rpc method: GetLogMessages
             outputChannel.append('Get log messages... ');
             logResult = await this.cmsisToolboxManager.runCsolutionRpc(
@@ -218,6 +211,14 @@ export class SolutionConverterImpl implements SolutionConverter {
         // apply select-compiler and discover layer configurations, reset state otherwise
         this.eventHub.fireConfigureSolutionDataReady({ availableCompilers, availableConfigurations });
 
+        // spawn cbuild setup asynchronously (fire-and-forget)
+        // cbuild completion will be signaled via onDidCbuildCompleted event
+        if (!detection && convertResult.success) {
+            // check if compile commands need to be updated: call cbuild setup skipping csolution convert step
+            outputChannel.append('Setup database... ');
+            this.compileCommandsGenerator.runCbuildSetup(); // no await
+        }
+
     }
 
     private async printErrorsWarnings(messages?: rpc.LogMessages): Promise<void> {

src/solutions/solution-event-hub.ts

@@ -40,7 +40,7 @@ export interface ConfigureSolutionData {
 /**
  * Base event data for cbuild setup completion result
  */
-export interface CbuildCompletionData {
+export interface CbuildResultData {
     success: boolean;
     severity: Severity;
     toolsOutputMessages?: string[];
@@ -49,17 +49,11 @@ export interface CbuildCompletionData {
 /**
  * Event data for solution conversion result
  */
-export interface ConvertResultData extends CbuildCompletionData {
+export interface ConvertResultData extends CbuildResultData {
     detection: boolean;
     logMessages: LogMessages;
 }
 
-/**
- * Event data for cbuild setup completion result
- */
-export interface CbuildResultData extends CbuildCompletionData {
-}
-
 /**
  * Centralized event hub for managing and coordinating solution-related events.
  * Provides bidirectional asynchronous event processing with type-safe event registration and firing.

src/solutions/solution-problems.ts

@@ -24,7 +24,7 @@ import { getFileNameFromPath } from '../utils/path-utils';
 import { stripTwoExtensions, stripVendor, stripVersion } from '../utils/string-utils';
 import { getWorkspaceFolder } from '../utils/vscode-utils';
 import { SolutionLoadStateChangeEvent, SolutionManager } from './solution-manager';
-import { ConvertResultData, SolutionEventHub } from './solution-event-hub';
+import { ConvertResultData, CbuildResultData, SolutionEventHub } from './solution-event-hub';
 
 export const toolsPrefixPatterns = {
     error: /^.*error (?:cbuild|cbuild2cmake|csolution|cpackget):\s*/,
@@ -152,8 +152,15 @@ export class SolutionProblemsImpl implements SolutionProblems {
         await this.updateDiagnostics(data.logMessages);
     }
 
-    private async handleCbuildCompleted(): Promise<void> {
-        // Cbuild completion handler (reserved for future use)
+    private async handleCbuildCompleted(data: CbuildResultData): Promise<void> {
+        // Enrich diagnostics with cbuild-specific output messages
+        const logMessages: LogMessages = { success: true, errors: [], warnings: [], info: [] };
+        await enrichLogMessagesFromToolOutput(logMessages, data.toolsOutputMessages);
+        // Merge cbuild errors/warnings into existing diagnostics
+        const csolution = this.solutionManager.getCsolution();
+        if (csolution && (logMessages.errors?.length || logMessages.warnings?.length)) {
+            await this.updateDiagnostics(logMessages);
+        }
     }
 
     private handleLoadStateChanged(data: SolutionLoadStateChangeEvent): void {