Update code

prompt_builder.py

@@ -3,6 +3,13 @@ from typing import List, Optional
 from schemas import CodeTaskType, RetrievedEvidence
 
 
+def clean_text(value: Optional[str], fallback: str = "None") -> str:
+    if value is None:
+        return fallback
+    text = str(value).strip()
+    return text if text else fallback
+
+
 def format_evidence(evidence_list: Optional[List[RetrievedEvidence]]) -> str:
     if not evidence_list:
         return "No external technical evidence provided."
@@ -32,12 +39,12 @@ def build_shared_context(
     evidence_list: Optional[List[RetrievedEvidence]] = None,
 ) -> str:
     parts = [
-        f"User Request:\n{message.strip()}",
-        f"Language:\n{language.strip() if language else 'Not specified'}",
-        f"Framework:\n{framework.strip() if framework else 'Not specified'}",
-        f"Previous Context:\n{previous_context.strip() if previous_context else 'None'}",
-        f"Error Message:\n{error_message.strip() if error_message else 'None'}",
-        f"Code:\n{code.strip() if code else 'No code provided'}",
+        f"User Request:\n{clean_text(message, '')}",
+        f"Language:\n{clean_text(language, 'Not specified')}",
+        f"Framework:\n{clean_text(framework, 'Not specified')}",
+        f"Previous Context:\n{clean_text(previous_context, 'None')}",
+        f"Error Message:\n{clean_text(error_message, 'None')}",
+        f"Code:\n{clean_text(code, 'No code provided')}",
         f"Technical Evidence:\n{format_evidence(evidence_list)}",
     ]
     return "\n\n".join(parts)
@@ -63,10 +70,11 @@ def build_generate_prompt(
         "1. Generate clean, correct, production-style code.\n"
         "2. Match the requested language and framework if provided.\n"
         "3. If the language or framework is missing, infer a reasonable default from the request.\n"
-        "4. Keep the explanation concise.\n"
+        "4. Keep the explanation concise and practical.\n"
         "5. Return code that is directly usable.\n"
         "6. Do not include unnecessary long prose.\n"
-        "7. Do not include multiple alternative implementations unless the user asks.\n\n"
+        "7. Do not include multiple alternative implementations unless the user asks.\n"
+        "8. Do not add unrelated features or speculative improvements.\n\n"
         f"{shared}\n\n"
         "Output Format:\n"
         "Explanation:\n"
@@ -103,10 +111,11 @@ def build_fix_prompt(
         "2. Preserve the user's intended logic where possible.\n"
         "3. Use the provided technical evidence if relevant.\n"
         "4. If the error details are incomplete, make the safest reasonable fix and mention assumptions.\n"
-        "5. Return the corrected code and a concise explanation.\n"
-        "6. Make the minimum necessary changes to solve the issue.\n"
-        "7. Do not change variable names, function names, class names, signatures, or public interfaces unless absolutely necessary to fix the issue.\n"
-        "8. Keep the final answer practical and directly usable.\n\n"
+        "5. Make the minimum necessary changes to solve the issue.\n"
+        "6. Do not change variable names, function names, class names, signatures, public interfaces, or structure unless absolutely necessary.\n"
+        "7. Do not rewrite unrelated parts of the code.\n"
+        "8. Return corrected code that is directly usable.\n"
+        "9. Keep the explanation concise and practical.\n\n"
         f"{shared}\n\n"
         "Output Format:\n"
         "Root Cause:\n"
@@ -139,9 +148,9 @@ def build_explain_prompt(
         "Follow these rules:\n"
         "1. Explain in a simple and structured way.\n"
         "2. Focus on the most important logic.\n"
-        "3. If code is provided, explain what it does and why.\n"
+        "3. If code is provided, explain what it does, why it works, and any important edge cases.\n"
         "4. Keep the explanation practical and concise.\n"
-        "5. Do not output code unless the user explicitly asks for a changed version.\n"
+        "5. Do not output changed code unless the user explicitly asks for changes.\n"
         "6. Do not rewrite the code.\n\n"
         f"{shared}\n\n"
         "Output Format:\n"
@@ -175,7 +184,8 @@ def build_refactor_prompt(
         "4. Do not rename variables, parameters, functions, classes, or methods unless absolutely necessary.\n"
         "5. Improve readability, maintainability, and structure only.\n"
         "6. If the code is already simple and acceptable, make only minimal improvements.\n"
-        "7. Return the improved code and a concise explanation of what was improved.\n\n"
+        "7. Do not rewrite unrelated sections.\n"
+        "8. Return improved code that remains easy to compare with the original.\n\n"
         f"{shared}\n\n"
         "Output Format:\n"
         "Explanation:\n"
@@ -207,9 +217,10 @@ def build_review_prompt(
         "1. Focus on correctness, readability, maintainability, edge cases, and possible bugs.\n"
         "2. Be specific and practical.\n"
         "3. Prefer review comments and suggestions over rewriting the code.\n"
-        "4. Only provide improved code if a small correction is truly necessary and helpful.\n"
+        '4. Only provide improved code if a small correction is truly necessary and helpful.\n'
         '5. If no rewrite is necessary, do not include a "Code" section.\n'
-        "6. Keep the output review-oriented, not refactor-oriented.\n\n"
+        "6. Keep the output review-oriented, not refactor-oriented.\n"
+        "7. Mention important risks and concrete suggestions.\n\n"
         f"{shared}\n\n"
         "Output Format:\n"
         "Review:\n"