Skip to content

The Unified and Autonomous Development Platform

chore: Use TASK_PROMPT instead of PROMPT to be compatible with zsh

Robin Shen6cd1990fd304
diff --git a/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/TaskAutomation.java b/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/TaskAutomation.java
index eee1f589d1..7f2c3a79ff 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/TaskAutomation.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/TaskAutomation.java
@@ -26,7 +26,7 @@ public class TaskAutomation implements Serializable {
@Editable(order = 100, name="Command to Run Task", description = """
Specify command to launch coding agent in headless mode to run assigned task in form of
- prompt. The prompt is stored in environment variable <code>$PROMPT</code>
+ prompt. The prompt is stored in environment variable <code>$TASK_PROMPT</code>
""")
@NotEmpty
public String getRunTaskCmd() {
diff --git a/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/template/ClaudeCodeInContainer.java b/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/template/ClaudeCodeInContainer.java
index 5008f11a63..7cb9289ffc 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/template/ClaudeCodeInContainer.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/template/ClaudeCodeInContainer.java
@@ -40,7 +40,7 @@ public class ClaudeCodeInContainer extends WorkspaceSpecTemplate {
userData.getPaths().add("/home/claude/.local/state");
workspaceSpec.getUserDatas().add(userData);
- configureTaskAutomation(workspaceSpec, "claude --dangerously-skip-permissions -p --verbose \"$PROMPT\"");
+ configureTaskAutomation(workspaceSpec, "claude --dangerously-skip-permissions -p --verbose \"$TASK_PROMPT\"");
return workspaceSpec;
}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/template/ClaudeCodeInShell.java b/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/template/ClaudeCodeInShell.java
index 8fd0287dfc..080dbad76d 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/template/ClaudeCodeInShell.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/template/ClaudeCodeInShell.java
@@ -29,7 +29,7 @@ public class ClaudeCodeInShell extends WorkspaceSpecTemplate {
shortcutConfig.setCommand("claude");
workspaceSpec.getShortcutConfigs().add(shortcutConfig);
- configureTaskAutomation(workspaceSpec, "claude --dangerously-skip-permissions -p --verbose \"$PROMPT\"");
+ configureTaskAutomation(workspaceSpec, "claude --dangerously-skip-permissions -p --verbose \"$TASK_PROMPT\"");
return workspaceSpec;
}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/template/CodexInContainer.java b/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/template/CodexInContainer.java
index ad78888d59..25ba3c7612 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/template/CodexInContainer.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/template/CodexInContainer.java
@@ -38,7 +38,7 @@ public class CodexInContainer extends WorkspaceSpecTemplate {
userData.getPaths().add("/home/codex/.profile");
workspaceSpec.getUserDatas().add(userData);
- configureTaskAutomation(workspaceSpec, "codex exec --dangerously-bypass-approvals-and-sandbox \"$PROMPT\"");
+ configureTaskAutomation(workspaceSpec, "codex exec --dangerously-bypass-approvals-and-sandbox \"$TASK_PROMPT\"");
return workspaceSpec;
}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/template/CodexInShell.java b/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/template/CodexInShell.java
index bb482f92de..1cdf02bde4 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/template/CodexInShell.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/template/CodexInShell.java
@@ -29,7 +29,7 @@ public class CodexInShell extends WorkspaceSpecTemplate {
shortcutConfig.setCommand("codex");
workspaceSpec.getShortcutConfigs().add(shortcutConfig);
- configureTaskAutomation(workspaceSpec, "codex exec --dangerously-bypass-approvals-and-sandbox \"$PROMPT\"");
+ configureTaskAutomation(workspaceSpec, "codex exec --dangerously-bypass-approvals-and-sandbox \"$TASK_PROMPT\"");
return workspaceSpec;
}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/template/CursorInContainer.java b/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/template/CursorInContainer.java
index 86b0c6e519..16cb736ffa 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/template/CursorInContainer.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/template/CursorInContainer.java
@@ -39,7 +39,7 @@ public class CursorInContainer extends WorkspaceSpecTemplate {
userData.getPaths().add("/home/cursor/.config/cursor");
workspaceSpec.getUserDatas().add(userData);
- configureTaskAutomation(workspaceSpec, "agent -p --force --approve-mcps --trust \"$PROMPT\"");
+ configureTaskAutomation(workspaceSpec, "agent -p --force --approve-mcps --trust \"$TASK_PROMPT\"");
return workspaceSpec;
}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/template/CursorInShell.java b/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/template/CursorInShell.java
index 8c9c326a87..9e00ec3ae2 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/template/CursorInShell.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/template/CursorInShell.java
@@ -29,7 +29,7 @@ public class CursorInShell extends WorkspaceSpecTemplate {
shortcutConfig.setCommand("agent");
workspaceSpec.getShortcutConfigs().add(shortcutConfig);
- configureTaskAutomation(workspaceSpec, "agent -p --force --approve-mcps --trust \"$PROMPT\"");
+ configureTaskAutomation(workspaceSpec, "agent -p --force --approve-mcps --trust \"$TASK_PROMPT\"");
return workspaceSpec;
}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/template/OpenCodeInContainer.java b/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/template/OpenCodeInContainer.java
index 97350aceb6..205ccf3e31 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/template/OpenCodeInContainer.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/template/OpenCodeInContainer.java
@@ -40,7 +40,7 @@ public class OpenCodeInContainer extends WorkspaceSpecTemplate {
userData.getPaths().add("/home/opencode/.local/state");
workspaceSpec.getUserDatas().add(userData);
- configureTaskAutomation(workspaceSpec, "opencode run --dangerously-skip-permissions \"$PROMPT\"");
+ configureTaskAutomation(workspaceSpec, "opencode run --dangerously-skip-permissions \"$TASK_PROMPT\"");
return workspaceSpec;
}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/template/OpenCodeInShell.java b/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/template/OpenCodeInShell.java
index fedded4d7c..d87f446446 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/template/OpenCodeInShell.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/workspace/spec/template/OpenCodeInShell.java
@@ -30,7 +30,7 @@ public class OpenCodeInShell extends WorkspaceSpecTemplate {
shortcutConfig.setCommand("opencode");
workspaceSpec.getShortcutConfigs().add(shortcutConfig);
- configureTaskAutomation(workspaceSpec, "opencode run --dangerously-skip-permissions \"$PROMPT\"");
+ configureTaskAutomation(workspaceSpec, "opencode run --dangerously-skip-permissions \"$TASK_PROMPT\"");
return workspaceSpec;
}
diff --git a/server-core/src/main/java/io/onedev/server/notification/IssueNotificationManager.java b/server-core/src/main/java/io/onedev/server/notification/IssueNotificationManager.java
index 1db00dde66..481b0d9fc1 100644
--- a/server-core/src/main/java/io/onedev/server/notification/IssueNotificationManager.java
+++ b/server-core/src/main/java/io/onedev/server/notification/IssueNotificationManager.java
@@ -337,9 +337,6 @@ public class IssueNotificationManager {
Work on current issue as roles [%s] to address %s's concern. Submit work afterwards if code is modified.
""".formatted(StringUtils.join(assignedFields, ", "), user.getName());
}
- if (mentionedUser.getAiSetting().getSystemPrompt() != null)
- prompt = "Rules:\n" + mentionedUser.getAiSetting().getSystemPrompt() + "\n\nUser:" + prompt;
-
workspaceService.runPrompt(mentionedUser, issue.getProject(), branch, prompt);
} catch (Throwable t) {
var explicitException = ExceptionUtils.find(t, ExplicitException.class);
diff --git a/server-core/src/main/java/io/onedev/server/workspace/DefaultWorkspaceService.java b/server-core/src/main/java/io/onedev/server/workspace/DefaultWorkspaceService.java
index 6209a15209..07863e65b4 100644
--- a/server-core/src/main/java/io/onedev/server/workspace/DefaultWorkspaceService.java
+++ b/server-core/src/main/java/io/onedev/server/workspace/DefaultWorkspaceService.java
@@ -1132,14 +1132,20 @@ public class DefaultWorkspaceService extends BaseEntityService<Workspace>
}
if (workspace.getStatus() == Workspace.Status.ACTIVE) {
- var command = decorateRunPromptCommand(finalApplicableSpec.getTaskAutomation().getRunTaskCmd(), prompt);
+ String fullPrompt;
+ if (ai.getAiSetting().getSystemPrompt() != null)
+ fullPrompt = "Rules:\n" + ai.getAiSetting().getSystemPrompt() + "\n\nUser:\n" + prompt;
+ else
+ fullPrompt = prompt;
+
+ var command = decorateRunPromptCommand(finalApplicableSpec.getTaskAutomation().getRunTaskCmd(), fullPrompt);
var buffer = new StringBuilder();
openShell(workspace, "Terminal", command, base64Data -> {
synchronized (buffer) {
try {
buffer.append(new String(Base64.getDecoder().decode(base64Data), UTF_8));
} catch (IllegalArgumentException e) {
- logger.debug("Unable to decode shell output", e);
+ logger.warn("Unable to decode shell output", e);
return;
}
if (buffer.indexOf(RUN_PROMPT_SUCCESS_MARKER) != -1) {
@@ -1166,7 +1172,7 @@ public class DefaultWorkspaceService extends BaseEntityService<Workspace>
private String decorateRunPromptCommand(String command, String prompt) {
return "(\n"
- + "\texport PROMPT=" + shellQuote(prompt) + "\n"
+ + "\texport TASK_PROMPT=" + shellQuote(prompt) + "\n"
+ command + "\n"
+ ")\n"
+ "if [ $? -eq 0 ]; then\n"