feat: Improve build project tool (#272)

tools/BuildProjectTool.cpp

@@ -19,11 +19,15 @@
 
 #include "BuildProjectTool.hpp"
 
+#include "GetIssuesListTool.hpp"
+
+#include <Version.hpp>
 #include <logger/Logger.hpp>
 #include <projectexplorer/buildmanager.h>
 #include <projectexplorer/project.h>
 #include <projectexplorer/projectmanager.h>
 #include <projectexplorer/target.h>
+#include <projectexplorer/task.h>
 #include <QApplication>
 #include <QJsonArray>
 #include <QJsonObject>
@@ -36,6 +40,20 @@ BuildProjectTool::BuildProjectTool(QObject *parent)
 {
 }
 
+BuildProjectTool::~BuildProjectTool()
+{
+    for (auto it = m_activeBuilds.begin(); it != m_activeBuilds.end(); ++it) {
+        BuildInfo &info = it.value();
+        if (info.buildFinishedConnection) {
+            disconnect(info.buildFinishedConnection);
+        }
+        if (info.promise) {
+            info.promise->finish();
+        }
+    }
+    m_activeBuilds.clear();
+}
+
 QString BuildProjectTool::name() const
 {
     return "build_project";
@@ -48,9 +66,11 @@ QString BuildProjectTool::stringName() const
 
 QString BuildProjectTool::description() const
 {
-    return "Build the current project in Qt Creator. "
+    return "Build the current project in Qt Creator and wait for completion. "
-           "No returns simultaneously build status and any compilation errors/warnings. "
+           "Returns build status (success/failure) and any compilation errors/warnings after "
-           "Optional 'rebuild' parameter: set to true to force a clean rebuild (default: false).";
+           "the build finishes. "
+           "Optional 'rebuild' parameter: set to true to force a clean rebuild (default: false). "
+           "Note: This operation may take some time depending on project size.";
 }
 
 QJsonObject BuildProjectTool::getDefinition(LLMCore::ToolSchemaFormat format) const
@@ -102,10 +122,36 @@ QFuture<QString> BuildProjectTool::executeAsync(const QJsonObject &input)
             QString("Error: Build is already in progress. Please wait for it to complete."));
     }
 
+    if (m_activeBuilds.contains(project)) {
+        LOG_MESSAGE("BuildProjectTool: Build already tracked for this project");
+        return QtFuture::makeReadyFuture(
+            QString("Error: Build is already being tracked for project '%1'.")
+                .arg(project->displayName()));
+    }
+
     bool rebuild = input.value("rebuild").toBool(false);
 
-    LOG_MESSAGE(QString("BuildProjectTool: Starting %1")
+    LOG_MESSAGE(QString("BuildProjectTool: Starting %1 for project '%2'")
-                    .arg(rebuild ? QString("rebuild") : QString("build")));
+                    .arg(rebuild ? QString("rebuild") : QString("build"))
+                    .arg(project->displayName()));
+
+    auto promise = QSharedPointer<QPromise<QString>>::create();
+    promise->start();
+
+    BuildInfo buildInfo;
+    buildInfo.promise = promise;
+    buildInfo.project = project;
+    buildInfo.projectName = project->displayName();
+    buildInfo.isRebuild = rebuild;
+
+    auto *buildManager = ProjectExplorer::BuildManager::instance();
+    buildInfo.buildFinishedConnection = QObject::connect(
+        buildManager,
+        &ProjectExplorer::BuildManager::buildQueueFinished,
+        this,
+        &BuildProjectTool::onBuildQueueFinished);
+
+    m_activeBuilds.insert(project, buildInfo);
 
     QMetaObject::invokeMethod(
         qApp,
@@ -120,10 +166,150 @@ QFuture<QString> BuildProjectTool::executeAsync(const QJsonObject &input)
         },
         Qt::QueuedConnection);
 
-    return QtFuture::makeReadyFuture(
+    LOG_MESSAGE(QString("BuildProjectTool: Build queued, waiting for completion..."));
-        QString("Build %1 started for project '%2'. Check the Compile Output pane for progress.")
+
-            .arg(rebuild ? QString("rebuild") : QString("build"))
+    return promise->future();
-            .arg(project->displayName()));
+}
+
+void BuildProjectTool::onBuildQueueFinished(bool success)
+{
+    LOG_MESSAGE(QString("BuildProjectTool: Build queue finished with status: %1")
+                    .arg(success ? "SUCCESS" : "FAILURE"));
+
+    QList<ProjectExplorer::Project *> projectsToCleanup;
+
+    for (auto it = m_activeBuilds.begin(); it != m_activeBuilds.end(); ++it) {
+        ProjectExplorer::Project *project = it.key();
+
+        if (!ProjectExplorer::BuildManager::isBuilding(project)) {
+            BuildInfo &info = it.value();
+
+            LOG_MESSAGE(QString("BuildProjectTool: Build completed for project '%1'")
+                            .arg(info.projectName));
+
+            if (info.promise && info.promise->future().isCanceled()) {
+                LOG_MESSAGE(
+                    QString("BuildProjectTool: Promise was cancelled for project '%1', cleaning up")
+                        .arg(info.projectName));
+                projectsToCleanup.append(project);
+                continue;
+            }
+
+            QString result = collectBuildResults(success, info.projectName, info.isRebuild);
+
+            if (info.promise) {
+                info.promise->addResult(result);
+                info.promise->finish();
+            }
+
+            projectsToCleanup.append(project);
+        }
+    }
+
+    for (ProjectExplorer::Project *project : projectsToCleanup) {
+        cleanupBuildInfo(project);
+    }
+}
+
+QString BuildProjectTool::collectBuildResults(
+    bool success, const QString &projectName, bool isRebuild)
+{
+    QStringList results;
+
+    // Build header
+    QString buildType = isRebuild ? QString("Rebuild") : QString("Build");
+    QString statusText = success ? QString("✓ SUCCEEDED") : QString("✗ FAILED");
+
+    results.append(QString("%1 %2 for project '%3'\n")
+                       .arg(buildType, statusText, projectName));
+
+    const auto tasks = IssuesTracker::instance().getTasks();
+
+    if (!tasks.isEmpty()) {
+        int errorCount = 0;
+        int warningCount = 0;
+        QStringList issuesList;
+
+        for (const ProjectExplorer::Task &task : tasks) {
+#if QODEASSIST_QT_CREATOR_VERSION >= QT_VERSION_CHECK(18, 0, 0)
+            auto taskType = task.type();
+            auto taskFile = task.file();
+            auto taskLine = task.line();
+            auto taskColumn = task.column();
+#else
+            auto taskType = task.type;
+            auto taskFile = task.file;
+            auto taskLine = task.line;
+            auto taskColumn = task.column;
+#endif
+
+            QString typeStr;
+            switch (taskType) {
+            case ProjectExplorer::Task::Error:
+                typeStr = QString("ERROR");
+                errorCount++;
+                break;
+            case ProjectExplorer::Task::Warning:
+                typeStr = QString("WARNING");
+                warningCount++;
+                break;
+            default:
+                continue; // Skip non-error/warning tasks
+            }
+
+            // Limit to first 50 issues to avoid overwhelming the LLM
+            if (issuesList.size() < 50) {
+                QString issueText = QString("[%1] %2").arg(typeStr, task.description());
+
+                if (!taskFile.isEmpty()) {
+                    issueText += QString("\n  File: %1").arg(taskFile.toUrlishString());
+                    if (taskLine > 0) {
+                        issueText += QString(":%1").arg(taskLine);
+                        if (taskColumn > 0) {
+                            issueText += QString(":%1").arg(taskColumn);
+                        }
+                    }
+                }
+
+                issuesList.append(issueText);
+            }
+        }
+
+        results.append(QString("Issues found: %1 error(s), %2 warning(s)")
+                           .arg(errorCount)
+                           .arg(warningCount));
+
+        if (!issuesList.isEmpty()) {
+            results.append("\nDetails:");
+            results.append(issuesList.join("\n\n"));
+
+            if (errorCount + warningCount > 50) {
+                results.append(
+                    QString("\n... and %1 more issue(s). Use get_issues_list tool for full list.")
+                        .arg(errorCount + warningCount - 50));
+            }
+        }
+    } else {
+        results.append("No compilation errors or warnings.");
+    }
+
+    return results.join("\n");
+}
+
+void BuildProjectTool::cleanupBuildInfo(ProjectExplorer::Project *project)
+{
+    if (!m_activeBuilds.contains(project)) {
+        return;
+    }
+
+    BuildInfo info = m_activeBuilds.take(project);
+
+    if (info.buildFinishedConnection) {
+        disconnect(info.buildFinishedConnection);
+    }
+
+    LOG_MESSAGE(QString("BuildProjectTool: Cleaned up build info for project '%1'")
+                    .arg(info.projectName));
 }
 
 } // namespace QodeAssist::Tools

tools/BuildProjectTool.hpp

@@ -20,15 +20,33 @@
 #pragma once
 
 #include <llmcore/BaseTool.hpp>
+#include <QHash>
 #include <QObject>
+#include <QPointer>
+#include <QPromise>
+#include <QSharedPointer>
+
+namespace ProjectExplorer {
+class Project;
+}
 
 namespace QodeAssist::Tools {
 
+struct BuildInfo
+{
+    QSharedPointer<QPromise<QString>> promise;
+    QPointer<ProjectExplorer::Project> project;
+    QString projectName;
+    bool isRebuild = false;
+    QMetaObject::Connection buildFinishedConnection;
+};
+
 class BuildProjectTool : public LLMCore::BaseTool
 {
     Q_OBJECT
 public:
     explicit BuildProjectTool(QObject *parent = nullptr);
+    ~BuildProjectTool() override;
 
     QString name() const override;
     QString stringName() const override;
@@ -37,6 +55,15 @@ public:
     LLMCore::ToolPermissions requiredPermissions() const override;
 
     QFuture<QString> executeAsync(const QJsonObject &input = QJsonObject()) override;
+
+private slots:
+    void onBuildQueueFinished(bool success);
+
+private:
+    QString collectBuildResults(bool success, const QString &projectName, bool isRebuild);
+    void cleanupBuildInfo(ProjectExplorer::Project *project);
+
+    QHash<ProjectExplorer::Project *, BuildInfo> m_activeBuilds;
 };
 
 } // namespace QodeAssist::Tools