The Unified and Autonomous Development Platform
feat(web): add on-demand AI fix button for failed builds
Robin Shencefa65cd6e46
diff --git a/server-core/src/main/java/io/onedev/server/ai/DefaultChatService.java b/server-core/src/main/java/io/onedev/server/ai/DefaultChatService.javaindex fdb7a4dc0b..249dab54fb 100644--- a/server-core/src/main/java/io/onedev/server/ai/DefaultChatService.java+++ b/server-core/src/main/java/io/onedev/server/ai/DefaultChatService.java@@ -191,7 +191,7 @@ public class DefaultChatService extends BaseEntityService<Chat> implements ChatSmessages = messages.subList(messages.size()-MAX_HISTORY_MESSAGES, messages.size());var langchain4jMessages = new ArrayList<dev.langchain4j.data.message.ChatMessage>();- langchain4jMessages.add(new SystemMessage("Your name is %s".formatted(request.getChat().getAi().getName())));+ langchain4jMessages.add(new SystemMessage("Your user name is %s".formatted(request.getChat().getAi().getName())));var systemPrompt = request.getChat().getAi().getAiSetting().getSystemPrompt();if (systemPrompt != null)langchain4jMessages.add(new SystemMessage(systemPrompt));diff --git a/server-core/src/main/java/io/onedev/server/ai/IssueHelper.java b/server-core/src/main/java/io/onedev/server/ai/IssueHelper.javaindex 3dfe21d6e3..50af0ec4a0 100644--- a/server-core/src/main/java/io/onedev/server/ai/IssueHelper.java+++ b/server-core/src/main/java/io/onedev/server/ai/IssueHelper.java@@ -1,23 +1,44 @@package io.onedev.server.ai;+import java.io.Serializable;import java.util.ArrayList;import java.util.Collection;import java.util.Comparator;+import java.util.Date;import java.util.HashMap;import java.util.LinkedHashMap;import java.util.List;import java.util.Map;+import org.apache.commons.lang3.StringUtils;+import org.apache.shiro.authz.UnauthorizedException;import org.apache.shiro.subject.Subject;import com.fasterxml.jackson.core.type.TypeReference;import com.fasterxml.jackson.databind.ObjectMapper;+import io.onedev.commons.utils.ExplicitException;import io.onedev.server.OneDev;+import io.onedev.server.SubscriptionService;import io.onedev.server.git.GitUtils;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueComment;+import io.onedev.server.model.IssueSchedule;import io.onedev.server.model.Project;+import io.onedev.server.model.support.issue.field.FieldUtils;+import io.onedev.server.model.support.issue.field.spec.BooleanField;+import io.onedev.server.model.support.issue.field.spec.DateField;+import io.onedev.server.model.support.issue.field.spec.DateTimeField;+import io.onedev.server.model.support.issue.field.spec.FieldSpec;+import io.onedev.server.model.support.issue.field.spec.FloatField;+import io.onedev.server.model.support.issue.field.spec.GroupChoiceField;+import io.onedev.server.model.support.issue.field.spec.IntegerField;+import io.onedev.server.model.support.issue.field.spec.choicefield.ChoiceField;+import io.onedev.server.model.support.issue.field.spec.userchoicefield.UserChoiceField;+import io.onedev.server.security.SecurityUtils;+import io.onedev.server.service.IssueService;+import io.onedev.server.service.IterationService;+import io.onedev.server.service.SettingService;import io.onedev.server.service.UrlService;public class IssueHelper {@@ -72,7 +93,7 @@ public class IssueHelper {return comments;}- public static Map<String, Object> getDetail(Subject subject, Project currentProject, Issue issue) {+ public static Map<String, Object> getDetail(Project currentProject, Issue issue) {var data = getSummary(currentProject, issue);data.put("branch", issue.getBranch());@@ -119,4 +140,130 @@ public class IssueHelper {return data;}+ public static String getParamName(String fieldName) {+ return fieldName.replace(' ', '-');+ }++ public static String appendDescription(String description, String additional) {+ if (description.isEmpty())+ return additional;+ if (description.endsWith("."))+ return description + " " + additional;+ return description + ". " + additional;+ }++ public static Map<String, Object> getFieldProperties(FieldSpec field) {+ var description = field.getDescription() != null ? field.getDescription().replace('\n', ' ') : "";+ if (field instanceof ChoiceField) {+ var choiceField = (ChoiceField) field;+ if (field.isAllowMultiple())+ description = appendDescription(description, "Expects one or more of: " + String.join(", ", choiceField.getPossibleValues()));+ else+ description = appendDescription(description, "Expects one of: " + String.join(", ", choiceField.getPossibleValues()));+ } else if (field instanceof UserChoiceField) {+ description = appendDescription(description, field.isAllowMultiple() ? "Expects user login names" : "Expects user login name");+ } else if (field instanceof GroupChoiceField) {+ description = appendDescription(description, field.isAllowMultiple() ? "Expects group names" : "Expects group name");+ } else if (field instanceof BooleanField) {+ description = appendDescription(description, "Expects boolean value, true or false");+ } else if (field instanceof IntegerField) {+ description = appendDescription(description, "Expects integer value");+ } else if (field instanceof FloatField) {+ description = appendDescription(description, "Expects float value");+ } else if (field instanceof DateField || field instanceof DateTimeField) {+ description = appendDescription(description, field.isAllowMultiple()+ ? "Expects unix timestamps in milliseconds since epoch"+ : "Expects unix timestamp in milliseconds since epoch");+ }++ var fieldProperties = new HashMap<String, Object>();+ if (field.isAllowMultiple()) {+ fieldProperties.put("type", "array");+ fieldProperties.put("items", Map.of("type", "string"));+ fieldProperties.put("uniqueItems", true);+ fieldProperties.put("description", description);+ } else {+ fieldProperties.put("type", "string");+ fieldProperties.put("description", description);+ }+ return fieldProperties;+ }++ public static Map<String, Object> getValidFields() {+ var issueFields = new HashMap<String, Object>();+ for (var field : OneDev.getInstance(SettingService.class).getIssueSetting().getFieldSpecs())+ issueFields.put(getParamName(field.getName()), getFieldProperties(field));+ return issueFields;+ }++ public static void normalizeData(Map<String, Serializable> data) {+ for (var entry : data.entrySet()) {+ if (entry.getValue() instanceof String)+ entry.setValue(StringUtils.trimToNull((String) entry.getValue()));+ }+ for (var field : OneDev.getInstance(SettingService.class).getIssueSetting().getFieldSpecs()) {+ var paramName = getParamName(field.getName());+ if (!paramName.equals(field.getName()) && data.containsKey(paramName)) {+ data.put(field.getName(), data.get(paramName));+ data.remove(paramName);+ }+ }+ }++ @SuppressWarnings("unchecked")+ public static Issue createIssue(Subject subject, Project project, Map<String, Serializable> data) {+ normalizeData(data);++ var issueSetting = OneDev.getInstance(SettingService.class).getIssueSetting();++ Issue issue = new Issue();+ var title = (String) data.remove("title");+ if (title == null)+ throw new ExplicitException("Title is required");+ issue.setTitle(title);+ var description = (String) data.remove("description");+ issue.setDescription(description);+ var confidential = (Boolean) data.remove("confidential");+ if (confidential != null)+ issue.setConfidential(confidential);++ Integer ownEstimatedTime = (Integer) data.remove("ownEstimatedTime");+ if (ownEstimatedTime != null) {+ var subscriptionService = OneDev.getInstance(SubscriptionService.class);+ if (!subscriptionService.isSubscriptionActive())+ throw new ExplicitException("An active subscription is required for this feature");+ if (!project.isTimeTracking())+ throw new ExplicitException("Time tracking needs to be enabled for the project");+ if (!SecurityUtils.canScheduleIssues(subject, project))+ throw new UnauthorizedException("Issue schedule permission required to set own estimated time");+ issue.setOwnEstimatedTime(ownEstimatedTime * 60);+ }++ List<String> iterationNames = (List<String>) data.remove("iterations");+ if (iterationNames != null) {+ if (!SecurityUtils.canScheduleIssues(subject, project))+ throw new UnauthorizedException("Issue schedule permission required to set iterations");+ var iterationService = OneDev.getInstance(IterationService.class);+ for (var iterationName : iterationNames) {+ var iteration = iterationService.findInHierarchy(project, iterationName);+ if (iteration == null)+ throw new ExplicitException("Iteration '" + iterationName + "' not found");+ IssueSchedule schedule = new IssueSchedule();+ schedule.setIssue(issue);+ schedule.setIteration(iteration);+ issue.getSchedules().add(schedule);+ }+ }++ issue.setProject(project);+ issue.setSubmitDate(new Date());+ issue.setSubmitter(SecurityUtils.getUser(subject));+ issue.setState(issueSetting.getInitialStateSpec().getName());++ issue.setFieldValues(FieldUtils.getFieldValues(subject, project, data));++ OneDev.getInstance(IssueService.class).open(issue);+ return issue;+ }+}diff --git a/server-core/src/main/java/io/onedev/server/ai/TodResource.java b/server-core/src/main/java/io/onedev/server/ai/TodResource.javaindex 15b11b2508..b365b9089a 100644--- a/server-core/src/main/java/io/onedev/server/ai/TodResource.java+++ b/server-core/src/main/java/io/onedev/server/ai/TodResource.java@@ -65,7 +65,6 @@ import io.onedev.server.model.Build;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueComment;import io.onedev.server.model.IssueLink;-import io.onedev.server.model.IssueSchedule;import io.onedev.server.model.IssueWork;import io.onedev.server.model.Iteration;import io.onedev.server.model.Project;@@ -79,15 +78,7 @@ import io.onedev.server.model.support.administration.SystemSetting;import io.onedev.server.model.support.code.ConventionalCommitChecker;import io.onedev.server.model.support.code.RegexpCommitChecker;import io.onedev.server.model.support.issue.field.FieldUtils;-import io.onedev.server.model.support.issue.field.spec.BooleanField;-import io.onedev.server.model.support.issue.field.spec.DateField;-import io.onedev.server.model.support.issue.field.spec.DateTimeField;import io.onedev.server.model.support.issue.field.spec.FieldSpec;-import io.onedev.server.model.support.issue.field.spec.FloatField;-import io.onedev.server.model.support.issue.field.spec.GroupChoiceField;-import io.onedev.server.model.support.issue.field.spec.IntegerField;-import io.onedev.server.model.support.issue.field.spec.choicefield.ChoiceField;-import io.onedev.server.model.support.issue.field.spec.userchoicefield.UserChoiceField;import io.onedev.server.model.support.issue.transitionspec.ManualSpec;import io.onedev.server.model.support.pullrequest.AutoMerge;import io.onedev.server.model.support.pullrequest.MergeStrategy;@@ -218,21 +209,6 @@ public class TodResource {return versionInfo;}- private String getParamName(String fieldName) {- return fieldName.replace(" ", "-");- }-- private String appendDescription(String description, String additionalDescription) {- if (description.length() > 0) {- if (description.endsWith("."))- return description + " " + additionalDescription;- else- return description + ". " + additionalDescription;- } else {- return additionalDescription;- }- }-private Project getProject(String projectPath) {var project = projectService.findByPath(projectPath);if (project == null || !SecurityUtils.canAccessProject(project))@@ -252,60 +228,11 @@ public class TodResource {}private Map<String, Object> getFieldProperties(FieldSpec field) {- String fieldDescription;- if (field.getDescription() != null)- fieldDescription = field.getDescription().replace("\n", " ");- else- fieldDescription = "";- if (field instanceof ChoiceField) {- var choiceField = (ChoiceField) field;- if (field.isAllowMultiple())- fieldDescription = appendDescription(fieldDescription,- "Expects one or more of: " + String.join(", ", choiceField.getPossibleValues()));- else- fieldDescription = appendDescription(fieldDescription,- "Expects one of: " + String.join(", ", choiceField.getPossibleValues()));- } else if (field instanceof UserChoiceField) {- if (field.isAllowMultiple())- fieldDescription = appendDescription(fieldDescription, "Expects user login names");- else- fieldDescription = appendDescription(fieldDescription, "Expects user login name");- } else if (field instanceof GroupChoiceField) {- } else if (field instanceof BooleanField) {- fieldDescription = appendDescription(fieldDescription, "Expects boolean value, true or false");- } else if (field instanceof IntegerField) {- fieldDescription = appendDescription(fieldDescription, "Expects integer value");- } else if (field instanceof FloatField) {- fieldDescription = appendDescription(fieldDescription, "Expects float value");- } else if (field instanceof DateField || field instanceof DateTimeField) {- if (field.isAllowMultiple())- fieldDescription = appendDescription(fieldDescription,- "Expects unix timestamps in milliseconds since epoch");- else- fieldDescription = appendDescription(fieldDescription,- "Expects unix timestamp in milliseconds since epoch");- }-- fieldDescription = escapeHtml5(fieldDescription);-- var fieldProperties = new HashMap<String, Object>();- if (field.isAllowMultiple()) {- fieldProperties.putAll(getArrayProperties(fieldDescription));- } else {- fieldProperties.put("type", "string");- fieldProperties.put("description", fieldDescription);- }+ var fieldProperties = new HashMap<>(IssueHelper.getFieldProperties(field));+ fieldProperties.put("description", escapeHtml5((String) fieldProperties.get("description")));return fieldProperties;}- private Map<String, Object> getArrayProperties(String description) {- return Map.of(- "type", "array",- "items", Map.of("type", "string"),- "uniqueItems", true,- "description", description);- }-@Api(description = "Get commit message requirement")@Path("/get-commit-message-requirement")@GET@@ -415,7 +342,7 @@ public class TodResource {throw new UnauthenticatedException();var issueFields = new HashMap<String, Object>();for (var field: settingService.getIssueSetting().getFieldSpecs()) {- var paramName = getParamName(field.getName());+ var paramName = IssueHelper.getParamName(field.getName());var fieldProperties = getFieldProperties(field);issueFields.put(paramName, fieldProperties);}@@ -562,7 +489,7 @@ public class TodResource {if (forWrite != null && forWrite &&!SecurityUtils.canWriteCode(issue.getProject()))throw new UnauthorizedException("No permission to write code in issue project");- return IssueHelper.getDetail(subject, currentProject, issue);+ return IssueHelper.getDetail(currentProject, issue);}@Path("/query-projects")@@ -652,58 +579,14 @@ public class TodResource {var projectContext = getProjectContext(projectPath, currentProjectPath);- normalizeIssueData(data);-- var issueSetting = settingService.getIssueSetting();-- Issue issue = new Issue();- var title = (String) data.remove("title");- if (title == null)- throw new NotAcceptableException("Title is required");- issue.setTitle(title);- var description = (String) data.remove("description");- issue.setDescription(description);- var confidential = (Boolean) data.remove("confidential");- if (confidential != null)- issue.setConfidential(confidential);-- Integer ownEstimatedTime = (Integer) data.remove("ownEstimatedTime");- if (ownEstimatedTime != null) {- if (!subscriptionService.isSubscriptionActive())- throw new NotAcceptableException("An active subscription is required for this feature");- if (!projectContext.project.isTimeTracking())- throw new NotAcceptableException("Time tracking needs to be enabled for the project");- if (!SecurityUtils.canScheduleIssues(projectContext.project))- throw new UnauthorizedException("Issue schedule permission required to set own estimated time");- issue.setOwnEstimatedTime(ownEstimatedTime*60);- }-- @SuppressWarnings("unchecked")- List<String> iterationNames = (List<String>) data.remove("iterations");- if (iterationNames != null) {- if (!SecurityUtils.canScheduleIssues(projectContext.project))- throw new UnauthorizedException("Issue schedule permission required to set iterations");- for (var iterationName : iterationNames) {- var iteration = iterationService.findInHierarchy(projectContext.project, iterationName);- if (iteration == null)- throw new NotFoundException("Iteration '" + iterationName + "' not found");- IssueSchedule schedule = new IssueSchedule();- schedule.setIssue(issue);- schedule.setIteration(iteration);- issue.getSchedules().add(schedule);- }+ Issue issue;+ try {+ issue = IssueHelper.createIssue(subject, projectContext.project, data);+ } catch (ExplicitException e) {+ throw new NotAcceptableException(e.getMessage());}- issue.setProject(projectContext.project);- issue.setSubmitDate(new Date());- issue.setSubmitter(SecurityUtils.getUser());- issue.setState(issueSetting.getInitialStateSpec().getName());-- issue.setFieldValues(FieldUtils.getFieldValues(subject, issue.getProject(), data));-- issueService.open(issue);-- return IssueHelper.getDetail(subject, projectContext.currentProject, issue);+ return IssueHelper.getDetail(projectContext.currentProject, issue);}@Path("/edit-issue")@@ -722,7 +605,7 @@ public class TodResource {var issue = getIssue(currentProject, issueReference);- normalizeIssueData(data);+ IssueHelper.normalizeData(data);var title = (String) data.remove("title");if (title != null) {@@ -777,7 +660,7 @@ public class TodResource {issueChangeService.changeFields(user, issue, FieldUtils.getFieldValues(subject, issue.getProject(), data));}- return IssueHelper.getDetail(subject, currentProject, issue);+ return IssueHelper.getDetail(currentProject, issue);}@Path("/change-issue-state")@@ -794,7 +677,7 @@ public class TodResource {var currentProject = getProject(currentProjectPath);var issue = getIssue(currentProject, issueReference);- normalizeIssueData(data);+ IssueHelper.normalizeData(data);var state = (String) data.remove("state");if (state == null)throw new NotAcceptableException("State is required");@@ -810,7 +693,7 @@ public class TodResource {var fieldValues = FieldUtils.getFieldValues(subject, issue.getProject(), data);issueChangeService.changeState(user, issue, state, fieldValues, transition.getPromptFields(),transition.getRemoveFields(), comment);- return IssueHelper.getDetail(subject, currentProject, issue);+ return IssueHelper.getDetail(currentProject, issue);}@Path("/ensure-issue-branch")@@ -908,19 +791,6 @@ public class TodResource {return workMap;}- private void normalizeIssueData(Map<String, Serializable> data) {- for (var entry: data.entrySet()) {- if (entry.getValue() instanceof String)- entry.setValue(trimToNull((String) entry.getValue()));- }- for (var field: settingService.getIssueSetting().getFieldSpecs()) {- var paramName = getParamName(field.getName());- if (!paramName.equals(field.getName()) && data.containsKey(paramName)) {- data.put(field.getName(), data.get(paramName));- data.remove(paramName);- }- }- }@Path("/query-pull-requests")@GETdiff --git a/server-core/src/main/java/io/onedev/server/ai/ToolUtils.java b/server-core/src/main/java/io/onedev/server/ai/ToolUtils.javaindex 279ea9a745..c89fbd7e86 100644--- a/server-core/src/main/java/io/onedev/server/ai/ToolUtils.java+++ b/server-core/src/main/java/io/onedev/server/ai/ToolUtils.java@@ -31,13 +31,6 @@ import io.onedev.server.ai.tools.code.GetDiffPatch;import io.onedev.server.ai.tools.code.GetFileContent;import io.onedev.server.ai.tools.code.QueryCodeSnippets;import io.onedev.server.ai.tools.code.QuerySymbolDefinitions;-import io.onedev.server.ai.tools.codecomment.AddCodeCommentReply;-import io.onedev.server.ai.tools.codecomment.ResolveCodeComment;-import io.onedev.server.ai.tools.codecomment.UnresolveCodeComment;-import io.onedev.server.ai.tools.pullrequest.AddPullRequestCodeComment;-import io.onedev.server.ai.tools.pullrequest.ApprovePullRequest;-import io.onedev.server.ai.tools.pullrequest.GetPullRequestCodeComments;-import io.onedev.server.ai.tools.pullrequest.RequestChangesForPullRequestTool;import io.onedev.server.exception.ExceptionUtils;import io.onedev.server.git.BlobIdent;import io.onedev.server.git.BlobIdentFilter;@@ -207,21 +200,6 @@ public class ToolUtils {);}- public static List<TaskTool> getPullRequestReviewTools(long pullRequestId) {- return List.of(- new ApprovePullRequest(pullRequestId),- new RequestChangesForPullRequestTool(pullRequestId));- }-- public static List<TaskTool> getPullRequestCodeCommentTools(long pullRequestId) {- return List.of(- new GetPullRequestCodeComments(pullRequestId),- new AddPullRequestCodeComment(pullRequestId),- new AddCodeCommentReply(),- new ResolveCodeComment(),- new UnresolveCodeComment());- }-public static void filterDuplications(List<ToolSpecification> toolSpecifications) {var seenNames = new HashSet<String>();for (var it = toolSpecifications.iterator(); it.hasNext();) {diff --git a/server-core/src/main/java/io/onedev/server/ai/tools/build/GetBuild.java b/server-core/src/main/java/io/onedev/server/ai/tools/build/GetBuild.javanew file mode 100644index 0000000000..a100d8d843--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/ai/tools/build/GetBuild.java@@ -0,0 +1,43 @@+package io.onedev.server.ai.tools.build;++import static io.onedev.server.ai.ToolUtils.convertToJson;++import org.apache.shiro.authz.UnauthorizedException;+import org.apache.shiro.subject.Subject;++import com.fasterxml.jackson.databind.JsonNode;++import dev.langchain4j.agent.tool.ToolSpecification;+import io.onedev.server.OneDev;+import io.onedev.server.ai.BuildHelper;+import io.onedev.server.ai.TaskTool;+import io.onedev.server.ai.ToolExecutionResult;+import io.onedev.server.security.SecurityUtils;+import io.onedev.server.service.BuildService;++public final class GetBuild implements TaskTool {++ private final long buildId;++ public GetBuild(long buildId) {+ this.buildId = buildId;+ }++ @Override+ public ToolSpecification getSpecification() {+ return ToolSpecification.builder()+ .name("getBuild")+ .description("Get info of build in json format")+ .build();+ }++ @Override+ public ToolExecutionResult execute(Subject subject, JsonNode arguments) {+ var build = OneDev.getInstance(BuildService.class).load(buildId);+ var project = build.getProject();+ if (!SecurityUtils.canAccessProject(subject, project))+ throw new UnauthorizedException();+ return new ToolExecutionResult(convertToJson(BuildHelper.getDetail(project, build)), false);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/ai/tools/codecomment/AddCodeCommentReply.java b/server-core/src/main/java/io/onedev/server/ai/tools/codecomment/AddCodeCommentReply.javadeleted file mode 100644index b640932a3d..0000000000--- a/server-core/src/main/java/io/onedev/server/ai/tools/codecomment/AddCodeCommentReply.java+++ /dev/null@@ -1,54 +0,0 @@-package io.onedev.server.ai.tools.codecomment;--import static io.onedev.server.ai.ToolUtils.convertToJson;--import java.util.Map;--import org.apache.shiro.subject.Subject;--import com.fasterxml.jackson.databind.JsonNode;--import dev.langchain4j.agent.tool.ToolSpecification;-import dev.langchain4j.model.chat.request.json.JsonObjectSchema;-import io.onedev.commons.utils.ExplicitException;-import io.onedev.server.OneDev;-import io.onedev.server.ai.CodeCommentHelper;-import io.onedev.server.ai.TaskTool;-import io.onedev.server.ai.ToolExecutionResult;-import io.onedev.server.service.CodeCommentService;--public final class AddCodeCommentReply implements TaskTool {-- @Override- public ToolSpecification getSpecification() {- return ToolSpecification.builder()- .name("addCodeCommentReply")- .description("Add a reply to an existing line-anchored code comment.")- .parameters(JsonObjectSchema.builder()- .addIntegerProperty("commentId").description("Existing code comment id")- .addStringProperty("content").description("Reply body")- .required("commentId", "content")- .build())- .build();- }-- @Override- public ToolExecutionResult execute(Subject subject, JsonNode arguments) {- if (arguments.get("commentId") == null)- return new ToolExecutionResult(convertToJson(Map.of("successful", false, "failReason", "Argument 'commentId' is required")), false);- var commentId = arguments.get("commentId").asLong();-- if (arguments.get("content") == null)- return new ToolExecutionResult(convertToJson(Map.of("successful", false, "failReason", "Argument 'content' is required")), false);- var content = arguments.get("content").asText();-- var comment = OneDev.getInstance(CodeCommentService.class).load(commentId);- try {- var reply = CodeCommentHelper.addReply(subject, comment, content);- return new ToolExecutionResult(convertToJson(reply), false);- } catch (ExplicitException e) {- return new ToolExecutionResult(convertToJson(Map.of("successful", false, "failReason", e.getMessage())), false);- }- }--}diff --git a/server-core/src/main/java/io/onedev/server/ai/tools/codecomment/ResolveCodeComment.java b/server-core/src/main/java/io/onedev/server/ai/tools/codecomment/ResolveCodeComment.javadeleted file mode 100644index 9eae5debc8..0000000000--- a/server-core/src/main/java/io/onedev/server/ai/tools/codecomment/ResolveCodeComment.java+++ /dev/null@@ -1,54 +0,0 @@-package io.onedev.server.ai.tools.codecomment;--import static io.onedev.server.ai.ToolUtils.convertToJson;--import java.util.Map;--import org.apache.shiro.subject.Subject;--import com.fasterxml.jackson.databind.JsonNode;--import dev.langchain4j.agent.tool.ToolSpecification;-import dev.langchain4j.model.chat.request.json.JsonObjectSchema;-import io.onedev.commons.utils.ExplicitException;-import io.onedev.server.OneDev;-import io.onedev.server.ai.CodeCommentHelper;-import io.onedev.server.ai.TaskTool;-import io.onedev.server.ai.ToolExecutionResult;-import io.onedev.server.service.CodeCommentService;--public final class ResolveCodeComment implements TaskTool {-- @Override- public ToolSpecification getSpecification() {- return ToolSpecification.builder()- .name("resolveCodeComment")- .description("Mark a line-anchored code comment as resolved, optionally with a short note")- .parameters(JsonObjectSchema.builder()- .addIntegerProperty("commentId").description("Existing code comment id")- .addStringProperty("note").description("Optional note explaining why it is resolved")- .required("commentId")- .build())- .build();- }-- @Override- public ToolExecutionResult execute(Subject subject, JsonNode arguments) {- if (arguments.get("commentId") == null)- return new ToolExecutionResult(convertToJson(Map.of("successful", false, "failReason", "Argument 'commentId' is required")), false);- var commentId = arguments.get("commentId").asLong();-- var comment = OneDev.getInstance(CodeCommentService.class).load(commentId);-- var noteNode = arguments.get("note");- var note = noteNode != null && !noteNode.isNull() ? noteNode.asText() : null;-- try {- var commentInfo = CodeCommentHelper.changeStatus(subject, comment, true, note);- return new ToolExecutionResult(convertToJson(commentInfo), false);- } catch (ExplicitException e) {- return new ToolExecutionResult(convertToJson(Map.of("successful", false, "failReason", e.getMessage())), false);- }- }--}diff --git a/server-core/src/main/java/io/onedev/server/ai/tools/codecomment/UnresolveCodeComment.java b/server-core/src/main/java/io/onedev/server/ai/tools/codecomment/UnresolveCodeComment.javadeleted file mode 100644index da785f751a..0000000000--- a/server-core/src/main/java/io/onedev/server/ai/tools/codecomment/UnresolveCodeComment.java+++ /dev/null@@ -1,52 +0,0 @@-package io.onedev.server.ai.tools.codecomment;--import static io.onedev.server.ai.ToolUtils.convertToJson;--import java.util.Map;--import org.apache.shiro.subject.Subject;--import com.fasterxml.jackson.databind.JsonNode;--import dev.langchain4j.agent.tool.ToolSpecification;-import dev.langchain4j.model.chat.request.json.JsonObjectSchema;-import io.onedev.commons.utils.ExplicitException;-import io.onedev.server.OneDev;-import io.onedev.server.ai.CodeCommentHelper;-import io.onedev.server.ai.TaskTool;-import io.onedev.server.ai.ToolExecutionResult;-import io.onedev.server.service.CodeCommentService;--public final class UnresolveCodeComment implements TaskTool {-- @Override- public ToolSpecification getSpecification() {- return ToolSpecification.builder()- .name("unresolveCodeComment")- .description("Mark a resolved line-anchored code comment as unresolved, optionally with a short note.")- .parameters(JsonObjectSchema.builder()- .addIntegerProperty("commentId").description("Existing code comment id")- .addStringProperty("note").description("Optional note explaining why it is marked as unresolved")- .required("commentId")- .build())- .build();- }-- @Override- public ToolExecutionResult execute(Subject subject, JsonNode arguments) {- if (arguments.get("commentId") == null)- return new ToolExecutionResult(convertToJson(Map.of("successful", false, "failReason", "Argument 'commentId' is required")), false);- var commentId = arguments.get("commentId").asLong();-- var noteNode = arguments.get("note");- var note = noteNode != null && !noteNode.isNull() ? noteNode.asText() : null;-- var comment = OneDev.getInstance(CodeCommentService.class).load(commentId);- try {- var commentInfo = CodeCommentHelper.changeStatus(subject, comment, false, note);- return new ToolExecutionResult(convertToJson(commentInfo), false);- } catch (ExplicitException e) {- return new ToolExecutionResult(convertToJson(Map.of("successful", false, "failReason", e.getMessage())), false);- }- }-}diff --git a/server-core/src/main/java/io/onedev/server/ai/tools/issue/CreateIssue.java b/server-core/src/main/java/io/onedev/server/ai/tools/issue/CreateIssue.javanew file mode 100644index 0000000000..fa2a58b335--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/ai/tools/issue/CreateIssue.java@@ -0,0 +1,117 @@+package io.onedev.server.ai.tools.issue;++import static io.onedev.server.ai.ToolUtils.convertToJson;+import static org.apache.commons.lang3.StringUtils.trimToNull;++import java.io.Serializable;+import java.util.ArrayList;+import java.util.LinkedHashMap;+import java.util.Map;++import org.apache.shiro.authz.UnauthorizedException;+import org.apache.shiro.subject.Subject;++import com.fasterxml.jackson.databind.JsonNode;++import dev.langchain4j.agent.tool.ToolSpecification;+import dev.langchain4j.model.chat.request.json.JsonArraySchema;+import dev.langchain4j.model.chat.request.json.JsonObjectSchema;+import dev.langchain4j.model.chat.request.json.JsonStringSchema;+import io.onedev.server.OneDev;+import io.onedev.server.ai.IssueHelper;+import io.onedev.server.ai.TaskTool;+import io.onedev.server.ai.ToolExecutionResult;+import io.onedev.server.security.SecurityUtils;+import io.onedev.server.service.ProjectService;++public final class CreateIssue implements TaskTool {++ private final long projectId;++ public CreateIssue(long projectId) {+ this.projectId = projectId;+ }++ @Override+ public ToolSpecification getSpecification() {+ return ToolSpecification.builder()+ .name("createIssue")+ .description("Create an issue in current project and return created issue in json format")+ .parameters(JsonObjectSchema.builder()+ .addStringProperty("title").description("Title of the issue")+ .addStringProperty("description").description("Description of the issue")+ .addBooleanProperty("confidential").description("Whether the issue is confidential")+ .addProperty("iterations", JsonArraySchema.builder()+ .description("Names of iterations to schedule the issue into")+ .items(new JsonStringSchema()).build())+ .addIntegerProperty("ownEstimatedTime").description("Estimated time in hours for this issue only (requires active subscription and time tracking enabled)")+ .addProperty("fields", JsonObjectSchema.builder()+ .description("Issue fields as a map of field name to value. "+ + "Call getValidFields tool to discover valid field names and allowed values")+ .additionalProperties(true).build())+ .required("title").build())+ .build();+ }++ @Override+ public ToolExecutionResult execute(Subject subject, JsonNode arguments) {+ var project = OneDev.getInstance(ProjectService.class).load(projectId);+ if (!SecurityUtils.canAccessProject(subject, project))+ throw new UnauthorizedException();++ if (!project.isIssueManagement())+ return new ToolExecutionResult(convertToJson(Map.of("successful", false, "failReason", "Issue management not enabled in this project")), false);++ var data = new LinkedHashMap<String, Serializable>();+ if (arguments.get("title") != null) {+ var title = trimToNull(arguments.get("title").asText());+ if (title != null)+ data.put("title", title);+ }+ if (arguments.get("description") != null)+ data.put("description", arguments.get("description").asText());+ if (arguments.get("confidential") != null)+ data.put("confidential", arguments.get("confidential").asBoolean());+ if (arguments.get("ownEstimatedTime") != null)+ data.put("ownEstimatedTime", arguments.get("ownEstimatedTime").asInt());++ if (arguments.get("iterations") != null) {+ var iterations = new ArrayList<String>();+ for (var iterationNode : arguments.get("iterations"))+ iterations.add(iterationNode.asText());+ data.put("iterations", iterations);+ }++ if (arguments.get("fields") != null) {+ var fields = arguments.get("fields").fields();+ while (fields.hasNext()) {+ var entry = fields.next();+ var value = entry.getValue();+ if (value == null || value.isNull()) {+ continue;+ } else if (value.isArray()) {+ var values = new ArrayList<String>();+ for (var element : value)+ values.add(element.asText());+ data.put(entry.getKey(), values);+ } else if (value.isTextual()) {+ var trimmed = trimToNull(value.asText());+ if (trimmed != null)+ data.put(entry.getKey(), trimmed);+ } else {+ data.put(entry.getKey(), value.asText());+ }+ }+ }++ try {+ var issue = IssueHelper.createIssue(subject, project, data);+ return new ToolExecutionResult(convertToJson(IssueHelper.getDetail(project, issue)), false);+ } catch (UnauthorizedException e) {+ throw e;+ } catch (RuntimeException e) {+ return new ToolExecutionResult(convertToJson(Map.of("successful", false, "failReason", e.getMessage())), false);+ }+ }++}diff --git a/server-core/src/main/java/io/onedev/server/ai/tools/issue/GetIssue.java b/server-core/src/main/java/io/onedev/server/ai/tools/issue/GetIssue.javaindex e1d8657ca4..5e94284966 100644--- a/server-core/src/main/java/io/onedev/server/ai/tools/issue/GetIssue.java+++ b/server-core/src/main/java/io/onedev/server/ai/tools/issue/GetIssue.java@@ -36,6 +36,8 @@ public final class GetIssue implements TaskTool {var issue = OneDev.getInstance(IssueService.class).load(issueId);if (!SecurityUtils.canAccessIssue(subject, issue))throw new UnauthorizedException();- return new ToolExecutionResult(convertToJson(IssueHelper.getDetail(subject, issue.getProject(), issue)), false);++ return new ToolExecutionResult(convertToJson(IssueHelper.getDetail(issue.getProject(), issue)), false);}+}diff --git a/server-core/src/main/java/io/onedev/server/ai/tools/issue/GetValidFields.java b/server-core/src/main/java/io/onedev/server/ai/tools/issue/GetValidFields.javanew file mode 100644index 0000000000..6830c2dfcc--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/ai/tools/issue/GetValidFields.java@@ -0,0 +1,35 @@+package io.onedev.server.ai.tools.issue;++import static io.onedev.server.ai.ToolUtils.convertToJson;++import org.apache.shiro.authz.UnauthenticatedException;+import org.apache.shiro.subject.Subject;++import com.fasterxml.jackson.databind.JsonNode;++import dev.langchain4j.agent.tool.ToolSpecification;+import io.onedev.server.ai.IssueHelper;+import io.onedev.server.ai.TaskTool;+import io.onedev.server.ai.ToolExecutionResult;+import io.onedev.server.security.SecurityUtils;++public final class GetValidFields implements TaskTool {++ @Override+ public ToolSpecification getSpecification() {+ return ToolSpecification.builder()+ .name("getValidFields")+ .description("Get valid issue fields and their allowed values in json format. "+ + "Call this to discover field names and values accepted by the 'fields' "+ + "argument of createIssue tool")+ .build();+ }++ @Override+ public ToolExecutionResult execute(Subject subject, JsonNode arguments) {+ if (SecurityUtils.getUser(subject) == null)+ throw new UnauthenticatedException();+ return new ToolExecutionResult(convertToJson(IssueHelper.getValidFields()), false);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/ai/tools/pullrequest/AddPullRequestCodeComment.java b/server-core/src/main/java/io/onedev/server/ai/tools/pullrequest/AddPullRequestCodeComment.javadeleted file mode 100644index 5bb5808672..0000000000--- a/server-core/src/main/java/io/onedev/server/ai/tools/pullrequest/AddPullRequestCodeComment.java+++ /dev/null@@ -1,77 +0,0 @@-package io.onedev.server.ai.tools.pullrequest;--import static io.onedev.server.ai.ToolUtils.convertToJson;--import java.util.Map;--import org.apache.shiro.authz.UnauthorizedException;-import org.apache.shiro.subject.Subject;--import com.fasterxml.jackson.databind.JsonNode;--import dev.langchain4j.agent.tool.ToolSpecification;-import dev.langchain4j.model.chat.request.json.JsonObjectSchema;-import io.onedev.commons.utils.ExplicitException;-import io.onedev.server.OneDev;-import io.onedev.server.ai.CodeCommentHelper;-import io.onedev.server.ai.PullRequestHelper;-import io.onedev.server.ai.TaskTool;-import io.onedev.server.ai.ToolExecutionResult;-import io.onedev.server.security.SecurityUtils;-import io.onedev.server.service.PullRequestService;--public final class AddPullRequestCodeComment implements TaskTool {-- private final long pullRequestId;-- public AddPullRequestCodeComment(long pullRequestId) {- this.pullRequestId = pullRequestId;- }-- @Override- public ToolSpecification getSpecification() {- return ToolSpecification.builder()- .name("addPullRequestCodeComment")- .description("Add a line-anchored code comment on a file in the OneDev pull request. "- + "The line range must appear on the right side (added or equal context lines) of the PR diff. "- + "Line numbers are 1-based in the file at the PR head commit.")- .parameters(JsonObjectSchema.builder()- .addStringProperty("filePath").description("Path of the file in the repository")- .addIntegerProperty("fromLine").description("Start line number, 1-based")- .addIntegerProperty("toLine").description("End line number, 1-based (omit to use fromLine)")- .addStringProperty("content").description("Comment body")- .required("filePath", "fromLine", "content")- .build())- .build();- }-- @Override- public ToolExecutionResult execute(Subject subject, JsonNode arguments) {- var request = OneDev.getInstance(PullRequestService.class).load(pullRequestId);- var user = SecurityUtils.getUser(subject);- if (!SecurityUtils.canReadCode(subject, request.getProject()) || user == null)- throw new UnauthorizedException();-- if (arguments.get("filePath") == null)- return new ToolExecutionResult(convertToJson(Map.of("successful", false, "failReason", "Argument 'filePath' is required")), false);- var filePath = arguments.get("filePath").asText();-- if (arguments.get("fromLine") == null)- return new ToolExecutionResult(convertToJson(Map.of("successful", false, "failReason", "Argument 'fromLine' is required")), false);- var fromLine = arguments.get("fromLine").asInt();-- var toLineNode = arguments.get("toLine");- var toLine = toLineNode != null && !toLineNode.isNull() ? toLineNode.asInt() : fromLine;-- if (arguments.get("content") == null)- return new ToolExecutionResult(convertToJson(Map.of("successful", false, "failReason", "Argument 'content' is required")), false);- var content = arguments.get("content").asText();-- try {- var comment = PullRequestHelper.addCodeComment(request, user, filePath, fromLine, toLine, content);- return new ToolExecutionResult(convertToJson(CodeCommentHelper.getDetail(comment)), false);- } catch (ExplicitException e) {- return new ToolExecutionResult(convertToJson(Map.of("successful", false, "failReason", e.getMessage())), false);- }- }-}diff --git a/server-core/src/main/java/io/onedev/server/ai/tools/pullrequest/ApprovePullRequest.java b/server-core/src/main/java/io/onedev/server/ai/tools/pullrequest/ApprovePullRequest.javadeleted file mode 100644index 0b7b96c256..0000000000--- a/server-core/src/main/java/io/onedev/server/ai/tools/pullrequest/ApprovePullRequest.java+++ /dev/null@@ -1,62 +0,0 @@-package io.onedev.server.ai.tools.pullrequest;--import static io.onedev.server.ai.ToolUtils.convertToJson;--import java.util.Map;--import org.apache.shiro.authz.UnauthorizedException;-import org.apache.shiro.subject.Subject;--import com.fasterxml.jackson.databind.JsonNode;--import dev.langchain4j.agent.tool.ToolSpecification;-import dev.langchain4j.model.chat.request.json.JsonObjectSchema;-import io.onedev.server.OneDev;-import io.onedev.server.ai.TaskTool;-import io.onedev.server.ai.ToolExecutionResult;-import io.onedev.server.security.SecurityUtils;-import io.onedev.server.service.PullRequestReviewService;-import io.onedev.server.service.PullRequestService;--public final class ApprovePullRequest implements TaskTool {-- public static final String TOOL_NAME = "approvePullRequest";-- private final long pullRequestId;-- public ApprovePullRequest(long pullRequestId) {- this.pullRequestId = pullRequestId;- }-- @Override- public ToolSpecification getSpecification() {- return ToolSpecification.builder()- .name(TOOL_NAME)- .description("Record an approval for OneDev pull request. "- + "Call this exactly once after you have finished reviewing and decided to approve.")- .parameters(JsonObjectSchema.builder()- .addStringProperty("reason").description("Reason explaining why you are approving this pull request. Make sure to quote relevant code snippets if applicable")- .required("reason")- .build())- .build();- }-- @Override- public ToolExecutionResult execute(Subject subject, JsonNode arguments) {- var request = OneDev.getInstance(PullRequestService.class).load(pullRequestId);- var user = SecurityUtils.getUser(subject);- if (!SecurityUtils.canReadCode(subject, request.getProject()) || user == null)- throw new UnauthorizedException();-- if (arguments.get("reason") == null)- return new ToolExecutionResult(convertToJson(Map.of("successful", false, "failReason", "Argument 'reason' is required")), false);- var reason = arguments.get("reason").asText();-- var result = PullRequestReviewerCheck.rejectIfNotReviewer(request, user);- if (result != null)- return result;-- OneDev.getInstance(PullRequestReviewService.class).review(user, request, true, reason);- return new ToolExecutionResult(convertToJson(Map.of("successful", true)), false);- }-}diff --git a/server-core/src/main/java/io/onedev/server/ai/tools/pullrequest/GetPullRequest.java b/server-core/src/main/java/io/onedev/server/ai/tools/pullrequest/GetPullRequest.javaindex d891a32036..83f70b1646 100644--- a/server-core/src/main/java/io/onedev/server/ai/tools/pullrequest/GetPullRequest.java+++ b/server-core/src/main/java/io/onedev/server/ai/tools/pullrequest/GetPullRequest.java@@ -27,7 +27,7 @@ public final class GetPullRequest implements TaskTool {public ToolSpecification getSpecification() {return ToolSpecification.builder().name("getPullRequest")- .description("Get info of OneDev pull request in json format")+ .description("Get info of pull request in json format").build();}diff --git a/server-core/src/main/java/io/onedev/server/ai/tools/pullrequest/GetPullRequestCodeComments.java b/server-core/src/main/java/io/onedev/server/ai/tools/pullrequest/GetPullRequestCodeComments.javadeleted file mode 100644index f0b3e9fd38..0000000000--- a/server-core/src/main/java/io/onedev/server/ai/tools/pullrequest/GetPullRequestCodeComments.java+++ /dev/null@@ -1,43 +0,0 @@-package io.onedev.server.ai.tools.pullrequest;--import static io.onedev.server.ai.ToolUtils.convertToJson;--import org.apache.shiro.authz.UnauthorizedException;-import org.apache.shiro.subject.Subject;--import com.fasterxml.jackson.databind.JsonNode;--import dev.langchain4j.agent.tool.ToolSpecification;-import io.onedev.server.OneDev;-import io.onedev.server.ai.PullRequestHelper;-import io.onedev.server.ai.TaskTool;-import io.onedev.server.ai.ToolExecutionResult;-import io.onedev.server.security.SecurityUtils;-import io.onedev.server.service.PullRequestService;--public final class GetPullRequestCodeComments implements TaskTool {-- private final long pullRequestId;-- public GetPullRequestCodeComments(long pullRequestId) {- this.pullRequestId = pullRequestId;- }-- @Override- public ToolSpecification getSpecification() {- return ToolSpecification.builder()- .name("getPullRequestCodeComments")- .description("Get line-anchored code comments on the OneDev pull request in json format. "- + "Each item includes id, filePath, startLine, endLine (1-based on the PR head), user, date, "- + "content, resolved, and replies.")- .build();- }-- @Override- public ToolExecutionResult execute(Subject subject, JsonNode arguments) {- var request = OneDev.getInstance(PullRequestService.class).load(pullRequestId);- if (!SecurityUtils.canReadCode(subject, request.getProject()))- throw new UnauthorizedException();- return new ToolExecutionResult(convertToJson(PullRequestHelper.getCodeComments(request)), false);- }-}diff --git a/server-core/src/main/java/io/onedev/server/ai/tools/pullrequest/GetPullRequestComments.java b/server-core/src/main/java/io/onedev/server/ai/tools/pullrequest/GetPullRequestComments.javaindex 6ae2b2b2af..6ced954952 100644--- a/server-core/src/main/java/io/onedev/server/ai/tools/pullrequest/GetPullRequestComments.java+++ b/server-core/src/main/java/io/onedev/server/ai/tools/pullrequest/GetPullRequestComments.java@@ -27,7 +27,7 @@ public final class GetPullRequestComments implements TaskTool {public ToolSpecification getSpecification() {return ToolSpecification.builder().name("getPullRequestComments")- .description("Get comments of OneDev pull request in json format")+ .description("Get comments of pull request in json format").build();}diff --git a/server-core/src/main/java/io/onedev/server/ai/tools/pullrequest/PullRequestReviewerCheck.java b/server-core/src/main/java/io/onedev/server/ai/tools/pullrequest/PullRequestReviewerCheck.javadeleted file mode 100644index d2075943dd..0000000000--- a/server-core/src/main/java/io/onedev/server/ai/tools/pullrequest/PullRequestReviewerCheck.java+++ /dev/null@@ -1,30 +0,0 @@-package io.onedev.server.ai.tools.pullrequest;--import static io.onedev.server.ai.ToolUtils.convertToJson;--import java.util.Map;--import org.jspecify.annotations.Nullable;--import io.onedev.server.ai.ToolExecutionResult;-import io.onedev.server.model.PullRequest;-import io.onedev.server.model.PullRequestReview;-import io.onedev.server.model.User;--public final class PullRequestReviewerCheck {-- private PullRequestReviewerCheck() {- }-- @Nullable- public static ToolExecutionResult rejectIfNotReviewer(PullRequest request, User user) {- var review = request.getReview(user);- if (review == null || review.getStatus() == PullRequestReview.Status.EXCLUDED) {- var data = Map.of(- "successful", false,- "failReason", "You are not a reviewer and is not allowed to approve this pull request. Add your option as comment instead");- return new ToolExecutionResult(convertToJson(data), false);- }- return null;- }-}diff --git a/server-core/src/main/java/io/onedev/server/ai/tools/pullrequest/RequestChangesForPullRequestTool.java b/server-core/src/main/java/io/onedev/server/ai/tools/pullrequest/RequestChangesForPullRequestTool.javadeleted file mode 100644index 76816ed949..0000000000--- a/server-core/src/main/java/io/onedev/server/ai/tools/pullrequest/RequestChangesForPullRequestTool.java+++ /dev/null@@ -1,62 +0,0 @@-package io.onedev.server.ai.tools.pullrequest;--import static io.onedev.server.ai.ToolUtils.convertToJson;--import java.util.Map;--import org.apache.shiro.authz.UnauthorizedException;-import org.apache.shiro.subject.Subject;--import com.fasterxml.jackson.databind.JsonNode;--import dev.langchain4j.agent.tool.ToolSpecification;-import dev.langchain4j.model.chat.request.json.JsonObjectSchema;-import io.onedev.server.OneDev;-import io.onedev.server.ai.TaskTool;-import io.onedev.server.ai.ToolExecutionResult;-import io.onedev.server.security.SecurityUtils;-import io.onedev.server.service.PullRequestReviewService;-import io.onedev.server.service.PullRequestService;--public final class RequestChangesForPullRequestTool implements TaskTool {-- public static final String TOOL_NAME = "requestChangesForPullRequest";-- private final long pullRequestId;-- public RequestChangesForPullRequestTool(long pullRequestId) {- this.pullRequestId = pullRequestId;- }-- @Override- public ToolSpecification getSpecification() {- return ToolSpecification.builder()- .name(TOOL_NAME)- .description("Record a request for changes for OneDev pull request. "- + "Call this exactly once after you have finished reviewing and decided changes are needed.")- .parameters(JsonObjectSchema.builder()- .addStringProperty("reason").description("Reason explaining why you are requesting changes for this pull request. Make sure to quote relevant code snippets if applicable")- .required("reason")- .build())- .build();- }-- @Override- public ToolExecutionResult execute(Subject subject, JsonNode arguments) {- var request = OneDev.getInstance(PullRequestService.class).load(pullRequestId);- var user = SecurityUtils.getUser(subject);- if (!SecurityUtils.canReadCode(subject, request.getProject()) || user == null)- throw new UnauthorizedException();-- if (arguments.get("reason") == null)- return new ToolExecutionResult(convertToJson(Map.of("successful", false, "failReason", "Argument 'reason' is required")), false);- var reason = arguments.get("reason").asText();-- var result = PullRequestReviewerCheck.rejectIfNotReviewer(request, user);- if (result != null)- return result;-- OneDev.getInstance(PullRequestReviewService.class).review(user, request, false, reason);- return new ToolExecutionResult(convertToJson(Map.of("successful", true)), false);- }-}diff --git a/server-core/src/main/java/io/onedev/server/web/asset/icon/fix.svg b/server-core/src/main/java/io/onedev/server/web/asset/icon/fix.svgnew file mode 100644index 0000000000..7778d78a34--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/asset/icon/fix.svg@@ -0,0 +1 @@+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1785244848552" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="24023" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M171.968 254.72l139.968 139.968h82.752V311.936L254.72 171.968a32 32 0 0 1 8.832-51.52c55.04-26.24 112.64-34.24 172.8-23.936 60.16 10.304 111.808 37.056 154.944 80.192a281.408 281.408 0 0 1 80.256 154.944c8.96 52.48 4.032 103.104-14.912 151.744l240.64 240.64c23.936 23.936 35.904 52.8 35.904 86.656 0 33.792-11.968 62.72-35.84 86.592-23.936 23.936-52.864 35.904-86.656 35.904-33.856 0-62.72-11.968-86.656-35.84l-240.64-240.64c-48.64 18.88-99.2 23.808-151.744 14.848a281.408 281.408 0 0 1-154.944-80.256 281.408 281.408 0 0 1-80.192-154.88 281.408 281.408 0 0 1 23.936-172.864 32 32 0 0 1 51.52-8.832z m49.984 291.328a218.88 218.88 0 0 0 120.512 62.4 218.88 218.88 0 0 0 134.4-18.624 32 32 0 0 1 36.48 6.208l256 256a56.32 56.32 0 0 0 41.344 17.152 56.32 56.32 0 0 0 41.344-17.152 56.32 56.32 0 0 0 17.152-41.344 56.32 56.32 0 0 0-17.152-41.408l-256-256a32 32 0 0 1-6.208-36.416c20.48-42.816 26.624-87.616 18.624-134.4a218.88 218.88 0 0 0-62.4-120.512 218.88 218.88 0 0 0-120.512-62.4 219.52 219.52 0 0 0-89.984 2.752L449.28 276.032a32 32 0 0 1 9.408 22.656v128a32 32 0 0 1-32 32h-128a32 32 0 0 1-22.656-9.408L162.304 335.552a219.52 219.52 0 0 0-2.752 89.984c8.064 46.784 28.8 86.976 62.4 120.512z" p-id="24024"></path></svg>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.javaindex 718a43ce37..9d789c3462 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java@@ -1,5 +1,6 @@package io.onedev.server.web.page.project;+import static io.onedev.server.ai.ToolUtils.wrapForChat;import static io.onedev.server.web.translation.Translation._T;import java.util.ArrayList;@@ -41,6 +42,10 @@ import com.google.common.collect.Lists;import edu.emory.mathcs.backport.java.util.Collections;import io.onedev.server.OneDev;+import io.onedev.server.ai.ChatTool;+import io.onedev.server.ai.ChatToolAware;+import io.onedev.server.ai.tools.issue.CreateIssue;+import io.onedev.server.ai.tools.issue.GetValidFields;import io.onedev.server.model.Project;import io.onedev.server.search.entity.project.ProjectQuery;import io.onedev.server.security.SecurityUtils;@@ -117,7 +122,7 @@ import io.onedev.server.web.page.project.workspaces.detail.WorkspaceDetailPage;import io.onedev.server.web.page.security.LoginPage;import io.onedev.server.web.util.ProjectAware;-public abstract class ProjectPage extends LayoutPage implements ProjectAware {+public abstract class ProjectPage extends LayoutPage implements ProjectAware, ChatToolAware {protected final IModel<Project> projectModel;@@ -559,7 +564,17 @@ public abstract class ProjectPage extends LayoutPage implements ProjectAware {}protected abstract Component newProjectTitle(String componentId);-++ @Override+ public List<ChatTool> getChatTools() {+ var tools = new ArrayList<ChatTool>();+ if (getProject().isIssueManagement()) {+ tools.add(wrapForChat(new CreateIssue(getProject().getId())));+ tools.add(wrapForChat(new GetValidFields()));+ }+ return tools;+ }+public static PageParameters paramsOf(Long projectId) {ProjectFacade project = getProjectService().findFacadeById(projectId);return paramsOf(project.getPath());diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.javaindex de43bc83d5..ed8bec98a4 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java@@ -66,7 +66,6 @@ import io.onedev.commons.utils.ExplicitException;import io.onedev.commons.utils.FileUtils;import io.onedev.commons.utils.PlanarRange;import io.onedev.server.ai.ChatTool;-import io.onedev.server.ai.ChatToolAware;import io.onedev.server.ai.tools.code.GetFileContent;import io.onedev.server.ai.tools.code.GetFilesAndSubfolders;import io.onedev.server.ai.tools.code.GetRootFilesAndFolders;@@ -143,7 +142,7 @@ import io.onedev.server.web.upload.FileUpload;import io.onedev.server.web.util.EditParamsAware;public class ProjectBlobPage extends ProjectPage implements BlobRenderContext,- EditParamsAware, JobAuthorizationContextAware, ChatToolAware, ProjectScopedCommitAware {+ EditParamsAware, JobAuthorizationContextAware, ProjectScopedCommitAware {private static final String PARAM_INITIAL_NEW_PATH = "initial-new-path";@@ -1730,93 +1729,91 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext,@Overridepublic List<ChatTool> getChatTools() {+ var tools = super.getChatTools();if (getCommit() != null) {- var projectId = getProject().getId();+ var projectId = getProject().getId();var commitId = getCommit().copy();-- return List.of(- wrapForChat(new GetRootFilesAndFolders() {-- @Override- protected Long getProjectId() {- return projectId;- }-- @Override- protected ObjectId getCommitId() {- return commitId;- }-- }),- wrapForChat(new GetFilesAndSubfolders() {-- @Override- protected Long getProjectId() {- return projectId;- }-- @Override- protected ObjectId getCommitId() {- return commitId;- }-- }),- wrapForChat(new GetFileContent(false) {-- @Override- protected Long getProjectId() {- return projectId;- }-- @Override- protected ObjectId getCommitId(boolean oldRevision) {- return commitId;- }-- }),- wrapForChat(new QuerySymbolDefinitions(false) {-- @Override- protected Long getProjectId() {- return projectId;- }-- @Override- protected ObjectId getCommitId(boolean oldRevision) {- return commitId;- }-- }),- wrapForChat(new QueryCodeSnippets(false) {-- @Override- protected Long getProjectId() {- return projectId;- }-- @Override- protected ObjectId getCommitId(boolean oldRevision) {- return commitId;- }-- }),- wrapForChat(new QueryFilePaths() {-- @Override- protected Long getProjectId() {- return projectId;- }-- @Override- protected ObjectId getCommitId() {- return commitId;- }-- })- );- } else {- return List.of();++ tools.add(wrapForChat(new GetRootFilesAndFolders() {++ @Override+ protected Long getProjectId() {+ return projectId;+ }++ @Override+ protected ObjectId getCommitId() {+ return commitId;+ }++ }));+ tools.add(wrapForChat(new GetFilesAndSubfolders() {++ @Override+ protected Long getProjectId() {+ return projectId;+ }++ @Override+ protected ObjectId getCommitId() {+ return commitId;+ }++ }));+ tools.add(wrapForChat(new GetFileContent(false) {++ @Override+ protected Long getProjectId() {+ return projectId;+ }++ @Override+ protected ObjectId getCommitId(boolean oldRevision) {+ return commitId;+ }++ }));+ tools.add(wrapForChat(new QuerySymbolDefinitions(false) {++ @Override+ protected Long getProjectId() {+ return projectId;+ }++ @Override+ protected ObjectId getCommitId(boolean oldRevision) {+ return commitId;+ }++ }));+ tools.add(wrapForChat(new QueryCodeSnippets(false) {++ @Override+ protected Long getProjectId() {+ return projectId;+ }++ @Override+ protected ObjectId getCommitId(boolean oldRevision) {+ return commitId;+ }++ }));+ tools.add(wrapForChat(new QueryFilePaths() {++ @Override+ protected Long getProjectId() {+ return projectId;+ }++ @Override+ protected ObjectId getCommitId() {+ return commitId;+ }++ }));}+ return tools;}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.htmlindex 964b6945b2..6425f3109a 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.html@@ -15,6 +15,7 @@<a wicket:id="setDescription" class="btn btn-icon btn-light btn-hover-primary btn-xs mr-1" t:data-tippy-content="Set description"><wicket:svg href="info" class="icon"/></a><a wicket:id="uploadArtifacts" class="btn btn-icon btn-light btn-hover-primary btn-xs mr-1" t:data-tippy-content="Upload artifacts"><wicket:svg href="upload" class="icon"/></a><a wicket:id="terminal" t:data-tippy-content="Open terminal of current running step" class="subscription-required btn btn-icon btn-light btn-hover-primary btn-xs mr-1"><wicket:svg href="terminal" class="icon"/></a>+ <a wicket:id="fix" t:data-tippy-content="Create issue to fix build failure with AI" class="btn btn-xs btn-light btn-hover-primary btn-icon mr-1"><wicket:svg href="fix" class="icon"></wicket:svg></a></div></div><div class="card-toolbar">diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.javaindex eca6e1821b..9b38b66f12 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java@@ -1,6 +1,7 @@package io.onedev.server.web.page.project.builds.detail;import static io.onedev.server.web.translation.Translation._T;+import static io.onedev.server.ai.ToolUtils.wrapForChat;import java.io.Serializable;import java.text.MessageFormat;@@ -89,6 +90,8 @@ import io.onedev.server.web.page.project.builds.detail.log.BuildLogPage;import io.onedev.server.web.page.project.builds.detail.pack.BuildPacksPage;import io.onedev.server.web.page.project.builds.detail.pipeline.BuildPipelinePage;import io.onedev.server.web.page.project.overview.ProjectOverviewPage;+import io.onedev.server.ai.ChatTool;+import io.onedev.server.ai.tools.build.GetBuild;import io.onedev.server.web.util.BuildAware;import io.onedev.server.web.util.ConfirmClickModifier;import io.onedev.server.web.util.Cursor;@@ -428,10 +431,27 @@ public abstract class BuildDetailPage extends ProjectPage});+ add(new AjaxLink<Void>("fix") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ getAssistant().show(target, "Create an issue to fix this build and assign to yourself. Display in " + getSession().getLocale().getDisplayLanguage());+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(getBuild().isFailed()+ && SecurityUtils.canWriteCode(getProject())+ && !getAssistant().getEntitledAis().isEmpty());+ }++ });+add(newBuildObserver(getBuild().getId()));}});-+add(new SideInfoLink("moreInfo"));add(new WebMarkupContainer("buildSpecNotFound") {@@ -709,4 +729,11 @@ public abstract class BuildDetailPage extends ProjectPagereturn new JobAuthorizationContext(getProject(), getBuild().getCommitId(), getBuild().getRequest());}+ @Override+ public List<ChatTool> getChatTools() {+ var tools = super.getChatTools();+ tools.add(wrapForChat(new GetBuild(getBuild().getId())));+ return tools;+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.javaindex c1119a9fea..440b5aa4a4 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java@@ -7,7 +7,6 @@ import io.onedev.commons.utils.ExplicitException;import io.onedev.commons.utils.PlanarRange;import io.onedev.server.OneDev;import io.onedev.server.ai.ChatTool;-import io.onedev.server.ai.ChatToolAware;import io.onedev.server.ai.tools.code.CommitDetailTool;import io.onedev.server.buildspec.BuildSpec;import io.onedev.server.buildspec.job.Job;@@ -93,7 +92,7 @@ import static io.onedev.server.entityreference.ReferenceUtils.transformReferenceimport static io.onedev.server.web.translation.Translation._T;import static java.util.stream.Collectors.toList;-public class CommitDetailPage extends ProjectPage implements RevisionAnnotationSupport, JobAuthorizationContextAware, ChatToolAware {+public class CommitDetailPage extends ProjectPage implements RevisionAnnotationSupport, JobAuthorizationContextAware {private static final Logger logger = LoggerFactory.getLogger(CommitDetailPage.class);@@ -1078,10 +1077,10 @@ public class CommitDetailPage extends ProjectPage implements RevisionAnnotationS@Overridepublic List<ChatTool> getChatTools() {+ var tools = super.getChatTools();var projectId = getProject().getId();var oldCommitId = getCompareWith().copy();var newCommitId = getCommit().copy();- var tools = new ArrayList<ChatTool>();tools.add(wrapForChat(new CommitDetailTool() {@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java b/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.javaindex b770de62e1..373509dfca 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java@@ -40,7 +40,6 @@ import com.google.common.collect.Lists;import io.onedev.commons.utils.PlanarRange;import io.onedev.server.ai.ChatTool;-import io.onedev.server.ai.ChatToolAware;import io.onedev.server.codequality.CodeProblem;import io.onedev.server.codequality.CodeProblemContribution;import io.onedev.server.codequality.CoverageStatus;@@ -81,7 +80,7 @@ import io.onedev.server.web.page.project.pullrequests.create.NewPullRequestPage;import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivitiesPage;import io.onedev.server.web.util.EditParamsAware;-public class RevisionComparePage extends ProjectPage implements RevisionAnnotationSupport, EditParamsAware, ChatToolAware {+public class RevisionComparePage extends ProjectPage implements RevisionAnnotationSupport, EditParamsAware {public enum TabPanel {COMMITS,@@ -968,14 +967,14 @@ public class RevisionComparePage extends ProjectPage implements RevisionAnnotati@Overridepublic List<ChatTool> getChatTools() {+ var tools = super.getChatTools();if (mergeBase != null) {var projectId = getProject().getId();var oldCommitId = state.compareWithMergeBase?mergeBase:state.leftSide.getCommit().copy();var newCommitId = state.rightSide.getCommit().copy();- return wrapForChat(getDiffTools(projectId, oldCommitId, newCommitId, null));- } else {- return new ArrayList<>();+ tools.addAll(wrapForChat(getDiffTools(projectId, oldCommitId, newCommitId, null)));}+ return tools;}}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.javaindex dcdcbe027f..2161acc6a5 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java@@ -36,7 +36,6 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import com.google.common.collect.Lists;import io.onedev.server.ai.ChatTool;-import io.onedev.server.ai.ChatToolAware;import io.onedev.server.ai.tools.issue.GetIssueComments;import io.onedev.server.ai.tools.issue.GetIssue;import io.onedev.server.buildspecmodel.inputspec.InputContext;@@ -75,7 +74,7 @@ import io.onedev.server.web.util.Cursor;import io.onedev.server.web.util.CursorSupport;import io.onedev.server.xodus.VisitInfoService;-public abstract class IssueDetailPage extends ProjectIssuesPage implements InputContext, ChatToolAware {+public abstract class IssueDetailPage extends ProjectIssuesPage implements InputContext {public static final String PARAM_ISSUE = "issue";@@ -453,9 +452,10 @@ public abstract class IssueDetailPage extends ProjectIssuesPage implements Input@Overridepublic List<ChatTool> getChatTools() {- return wrapForChat(List.of(- new GetIssue(getIssue().getId()),- new GetIssueComments(getIssue().getId())));+ var tools = super.getChatTools();+ tools.add(wrapForChat(new GetIssue(getIssue().getId())));+ tools.add(wrapForChat(new GetIssueComments(getIssue().getId())));+ return tools;}}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.javaindex f4723da447..56537c111c 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java@@ -65,7 +65,6 @@ import com.google.common.collect.Lists;import io.onedev.commons.utils.ExplicitException;import io.onedev.commons.utils.PlanarRange;import io.onedev.server.ai.ChatTool;-import io.onedev.server.ai.ChatToolAware;import io.onedev.server.attachment.AttachmentSupport;import io.onedev.server.attachment.ProjectAttachmentSupport;import io.onedev.server.codequality.CodeProblem;@@ -134,7 +133,7 @@ import io.onedev.server.web.page.security.LoginPage;import io.onedev.server.web.util.TextUtils;import io.onedev.server.web.util.editbean.LabelsBean;-public class NewPullRequestPage extends ProjectPage implements RevisionAnnotationSupport, ChatToolAware {+public class NewPullRequestPage extends ProjectPage implements RevisionAnnotationSupport {private static final Logger logger = LoggerFactory.getLogger(NewPullRequestPage.class);@@ -1228,14 +1227,14 @@ public class NewPullRequestPage extends ProjectPage implements RevisionAnnotatio@Overridepublic List<ChatTool> getChatTools() {+ var tools = super.getChatTools();if (!getPullRequest().isMerged()) {var projectId = getProject().getId();var oldCommitId = ObjectId.fromString(getPullRequest().getBaseCommitHash());var newCommitId = ObjectId.fromString(getPullRequest().getLatestUpdate().getHeadCommitHash());- return wrapForChat(getDiffTools(projectId, oldCommitId, newCommitId, null));- } else {- return new ArrayList<>();+ tools.addAll(wrapForChat(getDiffTools(projectId, oldCommitId, newCommitId, null)));}+ return tools;}}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.javaindex c3092821ac..ec8323de7a 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java@@ -70,8 +70,6 @@ import org.jetbrains.annotations.Nullable;import com.google.common.collect.Sets;import io.onedev.server.ai.ChatTool;-import io.onedev.server.ai.ChatToolAware;-import io.onedev.server.ai.TaskTool;import io.onedev.server.ai.ToolUtils;import io.onedev.server.ai.tools.pullrequest.GetPullRequest;import io.onedev.server.ai.tools.pullrequest.GetPullRequestComments;@@ -179,7 +177,7 @@ import io.onedev.server.web.util.editbean.LabelsBean;import io.onedev.server.workspace.WorkspaceService;import io.onedev.server.xodus.VisitInfoService;-public abstract class PullRequestDetailPage extends ProjectPage implements PullRequestAware, ChatToolAware {+public abstract class PullRequestDetailPage extends ProjectPage implements PullRequestAware {public static final String PARAM_REQUEST = "request";@@ -2474,16 +2472,17 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR@Overridepublic List<ChatTool> getChatTools() {- var pr = getPullRequest();- var tools = new ArrayList<TaskTool>();- var requestId = pr.getId();- var projectId = pr.getProject().getId();- var oldCommitId = ObjectId.fromString(pr.getBaseCommitHash());- var newCommitId = ObjectId.fromString(pr.getLatestUpdate().getHeadCommitHash());- tools.add(new GetPullRequest(requestId));- tools.add(new GetPullRequestComments(requestId));- tools.addAll(ToolUtils.getDiffTools(projectId, oldCommitId, newCommitId, requestId));- return wrapForChat(tools);+ var tools = super.getChatTools();+ var pullRequest = getPullRequest();+ var requestId = pullRequest.getId();+ tools.add(wrapForChat(new GetPullRequest(requestId)));+ tools.add(wrapForChat(new GetPullRequestComments(requestId)));++ var projectId = pullRequest.getProject().getId();+ var oldCommitId = ObjectId.fromString(pullRequest.getBaseCommitHash());+ var newCommitId = ObjectId.fromString(pullRequest.getLatestUpdate().getHeadCommitHash());+ tools.addAll(wrapForChat(ToolUtils.getDiffTools(projectId, oldCommitId, newCommitId, requestId)));+ return tools;}}