Fixed AutoChat

Author: cev-api

src/main/java/net/wurstclient/hacks/AutoChatHack.java

@@ -70,10 +70,15 @@ public final class AutoChatHack extends Hack implements ChatInputListener
 	private static final Pattern VALID_PLAYER_NAME =
 		Pattern.compile("^[A-Za-z0-9_]{1,16}$");
 
-	private static final String[] INJECTION_MARKERS =
-		{"ignore previous", "ignore all previous", "system prompt",
-			"developer message", "reveal prompt", "show prompt", "jailbreak",
-			"dan mode", "forget your instructions", "new instructions"};
+	private static final String[] INJECTION_MARKERS =
+		{"ignore previous", "ignore all previous", "system prompt",
+			"developer message", "reveal prompt", "show prompt", "jailbreak",
+			"dan mode", "forget your instructions", "new instructions"};
+	
+	private static final Pattern DEFAULT_PROMPT_USERNAME_LINE =
+		Pattern.compile("(?m)^Your username: .*$");
+	private static final Pattern DEFAULT_PROMPT_PERSONA_LINE =
+		Pattern.compile("(?m)^Persona: .*$");
 
 	private final TextFieldSetting apiKey =
 		new TextFieldSetting("OpenAI API key",
@@ -822,14 +827,14 @@ private JsonObject buildChatCompletionsRequest(List<ChatLine> snapshot,
 		return root;
 	}
 
-	private String buildSystemPrompt()
-	{
-		String custom = customSystemPrompt.getValue();
-		if(!custom.isBlank())
-			return custom;
-		
-		return buildDefaultSystemPrompt();
-	}
+	private String buildSystemPrompt()
+	{
+		String custom = normalizePromptText(customSystemPrompt.getValue());
+		if(!custom.isBlank() && !isGeneratedDefaultPromptSnapshot(custom))
+			return custom;
+		
+		return buildDefaultSystemPrompt();
+	}
 
 	private String buildDefaultSystemPrompt()
 	{
@@ -863,27 +868,64 @@ public void openSystemPromptEditor()
 		MC.setScreen(new AutoChatSystemPromptScreen(MC.screen, this));
 	}
 
-	public String getSystemPromptEditorText()
-	{
-		String custom = customSystemPrompt.getValue();
-		if(!custom.isBlank())
-			return custom;
-		
-		return buildDefaultSystemPrompt();
-	}
+	public String getSystemPromptEditorText()
+	{
+		String custom = normalizePromptText(customSystemPrompt.getValue());
+		if(!custom.isBlank() && !isGeneratedDefaultPromptSnapshot(custom))
+			return custom;
+		
+		return buildDefaultSystemPrompt();
+	}
 
 	public String getGeneratedDefaultSystemPrompt()
 	{
 		return buildDefaultSystemPrompt();
 	}
 
-	public void setCustomSystemPrompt(String prompt)
-	{
-		if(prompt == null)
-			return;
-		
-		customSystemPrompt.setValue(prompt);
-	}
+	public void setCustomSystemPrompt(String prompt)
+	{
+		if(prompt == null)
+			return;
+		
+		String normalized = normalizePromptText(prompt);
+		if(normalized.isBlank() || isGeneratedDefaultPromptSnapshot(normalized))
+		{
+			customSystemPrompt.setValue("");
+			return;
+		}
+		
+		customSystemPrompt.setValue(prompt);
+	}
+	
+	private static String normalizePromptText(String prompt)
+	{
+		if(prompt == null)
+			return "";
+		
+		return prompt.replace("\r\n", "\n").strip();
+	}
+	
+	private boolean isGeneratedDefaultPromptSnapshot(String prompt)
+	{
+		String normalizedPrompt = normalizePromptText(prompt);
+		if(normalizedPrompt.isBlank())
+			return false;
+		
+		String customSignature = toDefaultPromptSignature(normalizedPrompt);
+		String defaultSignature =
+			toDefaultPromptSignature(buildDefaultSystemPrompt());
+		return customSignature.equals(defaultSignature);
+	}
+	
+	private static String toDefaultPromptSignature(String prompt)
+	{
+		String signature = normalizePromptText(prompt);
+		signature = DEFAULT_PROMPT_USERNAME_LINE.matcher(signature)
+			.replaceFirst("Your username: <dynamic>");
+		signature = DEFAULT_PROMPT_PERSONA_LINE.matcher(signature)
+			.replaceFirst("Persona: <dynamic>");
+		return signature;
+	}
 
 	private String buildUserPrompt(List<ChatLine> snapshot, ChatLine latest,
 		boolean direct)