feat: Add run option to build project tool

This commit is contained in:
Petr Mironychev
2025-11-26 19:23:56 +01:00
parent 670f81c3dd
commit bbacdfc22a
3 changed files with 54 additions and 31 deletions

View File

@ -445,8 +445,6 @@ void OllamaProvider::processStreamData(const QString &requestId, const QJsonObje
QString thinkingDelta = messageObj["thinking"].toString(); QString thinkingDelta = messageObj["thinking"].toString();
if (!thinkingDelta.isEmpty()) { if (!thinkingDelta.isEmpty()) {
message->handleThinkingDelta(thinkingDelta); message->handleThinkingDelta(thinkingDelta);
LOG_MESSAGE(QString("OllamaProvider: Received thinking delta from message.thinking, length=%1")
.arg(thinkingDelta.length()));
if (!m_thinkingStarted.contains(requestId)) { if (!m_thinkingStarted.contains(requestId)) {
auto thinkingBlocks = message->getCurrentThinkingContent(); auto thinkingBlocks = message->getCurrentThinkingContent();
@ -457,9 +455,6 @@ void OllamaProvider::processStreamData(const QString &requestId, const QJsonObje
: currentThinking; : currentThinking;
emit thinkingBlockReceived(requestId, displayThinking, ""); emit thinkingBlockReceived(requestId, displayThinking, "");
LOG_MESSAGE(QString("Emitted initial thinking indicator for request %1, length=%2")
.arg(requestId)
.arg(currentThinking.length()));
m_thinkingStarted.insert(requestId); m_thinkingStarted.insert(requestId);
} }
} }

View File

@ -25,13 +25,18 @@
#include <logger/Logger.hpp> #include <logger/Logger.hpp>
#include <projectexplorer/buildmanager.h> #include <projectexplorer/buildmanager.h>
#include <projectexplorer/project.h> #include <projectexplorer/project.h>
#include <projectexplorer/projectexplorer.h>
#include <projectexplorer/projectexplorerconstants.h>
#include <projectexplorer/projectmanager.h> #include <projectexplorer/projectmanager.h>
#include <projectexplorer/runconfiguration.h>
#include <projectexplorer/target.h> #include <projectexplorer/target.h>
#include <projectexplorer/task.h> #include <projectexplorer/task.h>
#include <utils/id.h>
#include <QApplication> #include <QApplication>
#include <QJsonArray> #include <QJsonArray>
#include <QJsonObject> #include <QJsonObject>
#include <QMetaObject> #include <QMetaObject>
#include <QTimer>
namespace QodeAssist::Tools { namespace QodeAssist::Tools {
@ -61,15 +66,17 @@ QString BuildProjectTool::name() const
QString BuildProjectTool::stringName() const QString BuildProjectTool::stringName() const
{ {
return "Building project"; return "Building and running project";
} }
QString BuildProjectTool::description() const QString BuildProjectTool::description() const
{ {
return "Build the current project in Qt Creator and wait for completion. " return "Build the current project in Qt Creator and wait for completion. "
"Optionally run the project after successful build. "
"Returns build status (success/failure) and any compilation errors/warnings after " "Returns build status (success/failure) and any compilation errors/warnings after "
"the build finishes. " "the build finishes. "
"Optional 'rebuild' parameter: set to true to force a clean rebuild (default: false). " "Optional 'rebuild' parameter: set to true to force a clean rebuild (default: false). "
"Optional 'run_after_build' parameter: set to true to run the project after successful build (default: false). "
"Note: This operation may take some time depending on project size."; "Note: This operation may take some time depending on project size.";
} }
@ -82,6 +89,9 @@ QJsonObject BuildProjectTool::getDefinition(LLMCore::ToolSchemaFormat format) co
properties["rebuild"] = QJsonObject{ properties["rebuild"] = QJsonObject{
{"type", "boolean"}, {"type", "boolean"},
{"description", "Force a clean rebuild instead of incremental build (default: false)"}}; {"description", "Force a clean rebuild instead of incremental build (default: false)"}};
properties["run_after_build"] = QJsonObject{
{"type", "boolean"},
{"description", "Run the project after successful build (default: false)"}};
definition["properties"] = properties; definition["properties"] = properties;
definition["required"] = QJsonArray(); definition["required"] = QJsonArray();
@ -109,31 +119,28 @@ QFuture<QString> BuildProjectTool::executeAsync(const QJsonObject &input)
{ {
auto *project = ProjectExplorer::ProjectManager::startupProject(); auto *project = ProjectExplorer::ProjectManager::startupProject();
if (!project) { if (!project) {
LOG_MESSAGE("BuildProjectTool: No active project found");
return QtFuture::makeReadyFuture( return QtFuture::makeReadyFuture(
QString("Error: No active project found. Please open a project in Qt Creator.")); QString("Error: No active project found. Please open a project in Qt Creator."));
} }
LOG_MESSAGE(QString("BuildProjectTool: Active project is '%1'").arg(project->displayName()));
if (ProjectExplorer::BuildManager::isBuilding(project)) { if (ProjectExplorer::BuildManager::isBuilding(project)) {
LOG_MESSAGE("BuildProjectTool: Build is already in progress");
return QtFuture::makeReadyFuture( return QtFuture::makeReadyFuture(
QString("Error: Build is already in progress. Please wait for it to complete.")); QString("Error: Build is already in progress. Please wait for it to complete."));
} }
if (m_activeBuilds.contains(project)) { if (m_activeBuilds.contains(project)) {
LOG_MESSAGE("BuildProjectTool: Build already tracked for this project");
return QtFuture::makeReadyFuture( return QtFuture::makeReadyFuture(
QString("Error: Build is already being tracked for project '%1'.") QString("Error: Build is already being tracked for project '%1'.")
.arg(project->displayName())); .arg(project->displayName()));
} }
bool rebuild = input.value("rebuild").toBool(false); bool rebuild = input.value("rebuild").toBool(false);
bool runAfterBuild = input.value("run_after_build").toBool(false);
LOG_MESSAGE(QString("BuildProjectTool: Starting %1 for project '%2'") LOG_MESSAGE(QString("BuildProjectTool: %1 project '%2'%3")
.arg(rebuild ? QString("rebuild") : QString("build")) .arg(rebuild ? QString("Rebuilding") : QString("Building"))
.arg(project->displayName())); .arg(project->displayName())
.arg(runAfterBuild ? QString(" (run after build)") : QString()));
auto promise = QSharedPointer<QPromise<QString>>::create(); auto promise = QSharedPointer<QPromise<QString>>::create();
promise->start(); promise->start();
@ -143,6 +150,7 @@ QFuture<QString> BuildProjectTool::executeAsync(const QJsonObject &input)
buildInfo.project = project; buildInfo.project = project;
buildInfo.projectName = project->displayName(); buildInfo.projectName = project->displayName();
buildInfo.isRebuild = rebuild; buildInfo.isRebuild = rebuild;
buildInfo.runAfterBuild = runAfterBuild;
auto *buildManager = ProjectExplorer::BuildManager::instance(); auto *buildManager = ProjectExplorer::BuildManager::instance();
buildInfo.buildFinishedConnection = QObject::connect( buildInfo.buildFinishedConnection = QObject::connect(
@ -166,16 +174,11 @@ QFuture<QString> BuildProjectTool::executeAsync(const QJsonObject &input)
}, },
Qt::QueuedConnection); Qt::QueuedConnection);
LOG_MESSAGE(QString("BuildProjectTool: Build queued, waiting for completion..."));
return promise->future(); return promise->future();
} }
void BuildProjectTool::onBuildQueueFinished(bool success) void BuildProjectTool::onBuildQueueFinished(bool success)
{ {
LOG_MESSAGE(QString("BuildProjectTool: Build queue finished with status: %1")
.arg(success ? "SUCCESS" : "FAILURE"));
QList<ProjectExplorer::Project *> projectsToCleanup; QList<ProjectExplorer::Project *> projectsToCleanup;
for (auto it = m_activeBuilds.begin(); it != m_activeBuilds.end(); ++it) { for (auto it = m_activeBuilds.begin(); it != m_activeBuilds.end(); ++it) {
@ -184,19 +187,21 @@ void BuildProjectTool::onBuildQueueFinished(bool success)
if (!ProjectExplorer::BuildManager::isBuilding(project)) { if (!ProjectExplorer::BuildManager::isBuilding(project)) {
BuildInfo &info = it.value(); BuildInfo &info = it.value();
LOG_MESSAGE(QString("BuildProjectTool: Build completed for project '%1'")
.arg(info.projectName));
if (info.promise && info.promise->future().isCanceled()) { if (info.promise && info.promise->future().isCanceled()) {
LOG_MESSAGE( LOG_MESSAGE(QString("BuildProjectTool: Build cancelled for project '%1'")
QString("BuildProjectTool: Promise was cancelled for project '%1', cleaning up") .arg(info.projectName));
.arg(info.projectName));
projectsToCleanup.append(project); projectsToCleanup.append(project);
continue; continue;
} }
QString result = collectBuildResults(success, info.projectName, info.isRebuild); QString result = collectBuildResults(success, info.projectName, info.isRebuild);
if (success && info.runAfterBuild) {
scheduleProjectRun(project, info.projectName, result);
} else if (!success && info.runAfterBuild) {
result += QString("\n\nProject was not started due to build failure.");
}
if (info.promise) { if (info.promise) {
info.promise->addResult(result); info.promise->addResult(result);
info.promise->finish(); info.promise->finish();
@ -211,6 +216,29 @@ void BuildProjectTool::onBuildQueueFinished(bool success)
} }
} }
void BuildProjectTool::scheduleProjectRun(ProjectExplorer::Project *project,
const QString &projectName,
QString &result)
{
auto *target = project->activeTarget();
if (!target) {
result += QString("\n\nError: No active target found for the project.");
return;
}
auto *runConfig = target->activeRunConfiguration();
if (!runConfig) {
result += QString("\n\nError: No active run configuration found for the project.");
return;
}
QString runConfigName = runConfig->displayName();
result += QString("\n\nProject '%1' will be started with run configuration '%2'.")
.arg(projectName, runConfigName);
ProjectExplorer::ProjectExplorerPlugin::runProject(project, Utils::Id(ProjectExplorer::Constants::NORMAL_RUN_MODE));
}
QString BuildProjectTool::collectBuildResults( QString BuildProjectTool::collectBuildResults(
bool success, const QString &projectName, bool isRebuild) bool success, const QString &projectName, bool isRebuild)
{ {
@ -254,10 +282,9 @@ QString BuildProjectTool::collectBuildResults(
warningCount++; warningCount++;
break; break;
default: default:
continue; // Skip non-error/warning tasks continue;
} }
// Limit to first 50 issues to avoid overwhelming the LLM
if (issuesList.size() < 50) { if (issuesList.size() < 50) {
QString issueText = QString("[%1] %2").arg(typeStr, task.description()); QString issueText = QString("[%1] %2").arg(typeStr, task.description());
@ -307,9 +334,6 @@ void BuildProjectTool::cleanupBuildInfo(ProjectExplorer::Project *project)
if (info.buildFinishedConnection) { if (info.buildFinishedConnection) {
disconnect(info.buildFinishedConnection); disconnect(info.buildFinishedConnection);
} }
LOG_MESSAGE(QString("BuildProjectTool: Cleaned up build info for project '%1'")
.arg(info.projectName));
} }
} // namespace QodeAssist::Tools } // namespace QodeAssist::Tools

View File

@ -38,6 +38,7 @@ struct BuildInfo
QPointer<ProjectExplorer::Project> project; QPointer<ProjectExplorer::Project> project;
QString projectName; QString projectName;
bool isRebuild = false; bool isRebuild = false;
bool runAfterBuild = false;
QMetaObject::Connection buildFinishedConnection; QMetaObject::Connection buildFinishedConnection;
}; };
@ -60,6 +61,9 @@ private slots:
void onBuildQueueFinished(bool success); void onBuildQueueFinished(bool success);
private: private:
void scheduleProjectRun(ProjectExplorer::Project *project,
const QString &projectName,
QString &result);
QString collectBuildResults(bool success, const QString &projectName, bool isRebuild); QString collectBuildResults(bool success, const QString &projectName, bool isRebuild);
void cleanupBuildInfo(ProjectExplorer::Project *project); void cleanupBuildInfo(ProjectExplorer::Project *project);