The Unified and Autonomous Development Platform
fix: Conversation with AI user often ends with empty response (OD-2698)
Robin Shenf5bd0616601c
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 b7e73d2700..8fba9ed807 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@@ -76,6 +76,7 @@ import io.onedev.server.taskschedule.TaskScheduler;import io.onedev.server.util.concurrent.BatchWorkExecutionService;import io.onedev.server.util.concurrent.BatchWorker;import io.onedev.server.util.concurrent.Prioritized;+import io.onedev.server.ai.tools.TaskComplete;import io.onedev.server.web.SessionListener;import io.onedev.server.web.WebSession;import io.onedev.server.web.page.base.BasePage;@@ -162,6 +163,9 @@ public class DefaultChatService extends BaseEntityService<Chat> implements ChatS.stream().map(ChatTool::getSpecification).collect(Collectors.toList());++ // Add the taskComplete tool - this must always be present+ toolSpecifications.add(TaskComplete.getSpecification());ToolUtils.filterDuplications(toolSpecifications);@@ -190,6 +194,7 @@ public class DefaultChatService extends BaseEntityService<Chat> implements ChatSvar systemPrompt = request.getChat().getAi().getAiSetting().getSystemPrompt();if (systemPrompt != null)langchain4jMessages.add(new SystemMessage(systemPrompt));+ langchain4jMessages.add(new SystemMessage(TaskComplete.SYSTEM_MESSAGE));langchain4jMessages.addAll(messages.stream().map(it -> {var content = it.getContent();@@ -205,6 +210,8 @@ public class DefaultChatService extends BaseEntityService<Chat> implements ChatSvar responseFuture = new CompletableFuture<String>();var executionFuture = executorService.submit(new Runnable() {+ private int noToolRetryCount = 0;+private StreamingChatResponseHandler newResponseHandler(Subject subject) {return new StreamingChatResponseHandler() {@@ -279,6 +286,14 @@ public class DefaultChatService extends BaseEntityService<Chat> implements ChatSif (responseFuture.isDone())return;String toolName = toolRequest.name();++ // Handle taskComplete specially - it signals conversation completion+ var taskCompleteResponse = TaskComplete.getResponse(toolRequest);+ if (taskCompleteResponse != null) {+ responseFuture.complete(taskCompleteResponse);+ return;+ }+try {var toolExecution = new AiToolExecution(toolName, ToolUtils.getToolArguments(toolRequest));connection.sendMessage(toolExecution);@@ -313,7 +328,25 @@ public class DefaultChatService extends BaseEntityService<Chat> implements ChatS.build();streamingChatModel.chat(langchain4jChatRequest, handler);} else {- responseFuture.complete(aiMessage.text());+ // LLM didn't call any tool - prompt it to continue or call taskComplete+ noToolRetryCount++;+ if (noToolRetryCount <= TaskComplete.MAX_NO_TOOL_RETRIES) {+ var text = aiMessage.text();+ if (StringUtils.isNotBlank(text)) {+ langchain4jMessages.add(aiMessage);+ }+ langchain4jMessages.add(new UserMessage(TaskComplete.CONTINUATION_PROMPT));++ var handler = newResponseHandler(SecurityUtils.getSubject());+ var langchain4jChatRequest = ChatRequest.builder()+ .messages(new ArrayList<>(langchain4jMessages))+ .toolSpecifications(toolSpecifications)+ .build();+ streamingChatModel.chat(langchain4jChatRequest, handler);+ } else {+ // Max retries exceeded, accept whatever response we have+ responseFuture.complete(aiMessage.text());+ }}} catch (Throwable t) {responseFuture.completeExceptionally(t);diff --git a/server-core/src/main/java/io/onedev/server/ai/QueryDescriptions.java b/server-core/src/main/java/io/onedev/server/ai/QueryDescriptions.javaindex 2b64a91e24..a843d74032 100644--- a/server-core/src/main/java/io/onedev/server/ai/QueryDescriptions.java+++ b/server-core/src/main/java/io/onedev/server/ai/QueryDescriptions.java@@ -503,7 +503,7 @@ public class QueryDescriptions {;revision- : 'commit(' CommitHash ')'+ : 'commit(' CommitHash ')'| 'build(' '#'Number ')'| 'branch(' BranchName ')'| 'tag(' TagName ')'diff --git a/server-core/src/main/java/io/onedev/server/ai/tools/TaskComplete.java b/server-core/src/main/java/io/onedev/server/ai/tools/TaskComplete.javanew file mode 100644index 0000000000..053acceab9--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/ai/tools/TaskComplete.java@@ -0,0 +1,58 @@+package io.onedev.server.ai.tools;++import org.jspecify.annotations.Nullable;++import dev.langchain4j.agent.tool.ToolExecutionRequest;+import dev.langchain4j.agent.tool.ToolSpecification;+import dev.langchain4j.model.chat.request.json.JsonObjectSchema;+import io.onedev.commons.utils.StringUtils;+import io.onedev.server.ai.ToolUtils;++/**+ * Special tool that signals the AI has completed its task and is ready to provide+ * the final response. This tool is handled specially by DefaultChatService - when+ * called, it completes the conversation with the provided response instead of+ * continuing the tool execution loop.+ */+public class TaskComplete {++ public static final String TOOL_NAME = "taskComplete";++ public static final int MAX_NO_TOOL_RETRIES = 3;++ public static final String SYSTEM_MESSAGE =+ "IMPORTANT: When you have completed your task, you MUST call the 'taskComplete' tool with your final response. " ++ "Do not provide a response without calling a tool. Always either call a tool to perform an action, or call 'taskComplete' to finish.";++ public static final String CONTINUATION_PROMPT =+ "Please continue with your task, or call 'taskComplete' tool with your final response if you are finished.";++ public static ToolSpecification getSpecification() {+ return ToolSpecification.builder()+ .name(TOOL_NAME)+ .description("Call this tool when you have completed the task and are ready to provide your final response to the user. " ++ "You MUST call this tool to finish the conversation - do not respond without calling a tool.")+ .parameters(JsonObjectSchema.builder()+ .addStringProperty("response", "Your final response to the user's request. This will be shown directly to the user.")+ .required("response")+ .build())+ .build();+ }++ /**+ * Checks if the tool request is a taskComplete call and extracts the response.+ *+ * @param toolRequest the tool execution request+ * @return the response string if this is a taskComplete call, null otherwise+ */+ @Nullable+ public static String getResponse(ToolExecutionRequest toolRequest) {+ if (TOOL_NAME.equals(toolRequest.name())) {+ var arguments = ToolUtils.getToolArguments(toolRequest);+ var responseNode = arguments.get("response");+ return responseNode != null ? StringUtils.trimToEmpty(responseNode.asText()) : "";+ }+ return null;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/service/impl/DefaultUserService.java b/server-core/src/main/java/io/onedev/server/service/impl/DefaultUserService.javaindex 7eb8584f33..f16ce9b53f 100644--- a/server-core/src/main/java/io/onedev/server/service/impl/DefaultUserService.java+++ b/server-core/src/main/java/io/onedev/server/service/impl/DefaultUserService.java@@ -8,6 +8,8 @@ import java.util.Collection;import java.util.List;import java.util.UUID;import java.util.concurrent.ExecutorService;+import java.util.concurrent.atomic.AtomicBoolean;+import java.util.concurrent.atomic.AtomicInteger;import java.util.stream.Collectors;import javax.inject.Inject;@@ -33,9 +35,11 @@ import dev.langchain4j.data.message.UserMessage;import dev.langchain4j.model.chat.request.ChatRequest;import io.onedev.commons.utils.ExceptionUtils;import io.onedev.commons.utils.ExplicitException;+import io.onedev.commons.utils.StringUtils;import io.onedev.server.ai.AiTask;import io.onedev.server.ai.TaskTool;import io.onedev.server.ai.ToolUtils;+import io.onedev.server.ai.tools.TaskComplete;import io.onedev.server.cluster.ClusterService;import io.onedev.server.event.Listen;import io.onedev.server.event.entity.EntityPersisted;@@ -587,12 +591,19 @@ public class DefaultUserService extends BaseEntityService<User> implements UserSmessages.add(new SystemMessage(aiSetting.getSystemPrompt()));if (task.getSystemPrompt() != null)messages.add(new SystemMessage(task.getSystemPrompt()));+ messages.add(new SystemMessage(TaskComplete.SYSTEM_MESSAGE));messages.add(new UserMessage(task.getUserPrompt()));var tools = task.getTools();var toolSpecifications = tools.stream().map(TaskTool::getSpecification).collect(Collectors.toList());++ // Add the taskComplete tool - this must always be present+ toolSpecifications.add(TaskComplete.getSpecification());+ToolUtils.filterDuplications(toolSpecifications);++ var noToolRetryCount = new AtomicInteger(0);while (true) {if (Thread.interrupted())throw new InterruptedException();@@ -604,20 +615,42 @@ public class DefaultUserService extends BaseEntityService<User> implements UserSvar aiMessage = response.aiMessage();if (!aiMessage.hasToolExecutionRequests()) {- sessionService.run(() -> {- task.getResponseHandler().onResponse(- Preconditions.checkNotNull(SecurityUtils.getUser(subject)),- aiMessage.text());- });- break;+ // LLM didn't call any tool - prompt it to continue or call taskComplete+ var text = aiMessage.text();+ if (noToolRetryCount.incrementAndGet() <= TaskComplete.MAX_NO_TOOL_RETRIES) {+ if (StringUtils.isNotBlank(text))+ messages.add(aiMessage);+ messages.add(new UserMessage(TaskComplete.CONTINUATION_PROMPT));+ continue;+ } else {+ // Max retries exceeded, accept whatever response we have+ sessionService.run(() -> {+ task.getResponseHandler().onResponse(+ Preconditions.checkNotNull(SecurityUtils.getUser(subject)),+ StringUtils.isBlank(text)?"Empty response received":text);+ });+ break;+ }}- messages.add(aiMessage);+ messages.add(aiMessage);+ var taskCompleted = new AtomicBoolean(false);sessionService.run(() -> {for (var toolRequest : aiMessage.toolExecutionRequests()) {if (Thread.interrupted())throw new RuntimeException(new InterruptedException());- var toolName = toolRequest.name();++ // Handle taskComplete specially - it signals task completion+ var taskCompleteResponse = TaskComplete.getResponse(toolRequest);+ if (taskCompleteResponse != null) {+ task.getResponseHandler().onResponse(+ Preconditions.checkNotNull(SecurityUtils.getUser(subject)),+ StringUtils.isBlank(taskCompleteResponse)?"Empty response received":taskCompleteResponse);+ taskCompleted.set(true);+ return;+ }++ var toolName = toolRequest.name();try {var tool = tools.stream().filter(it -> it.getSpecification().name().equals(toolName))@@ -629,6 +662,9 @@ public class DefaultUserService extends BaseEntityService<User> implements UserS}}});++ if (taskCompleted.get())+ break;}} catch (Throwable e) {sessionService.run(() -> {