--- a/core/conversation.py
+++ b/core/conversation.py
@@ -92,22 +92,24 @@
         Only applicable for standard role-play and message drafting scenarios.
         """
         # Patterns for different scenario types that require parsing
         # core/elo.py  (or wherever you define _parse_response)
+        # [JA-PATCH Fix-C1] Also accept Japanese section headers as fallback.
         draft_patterns = {
-            "perspective_taking":   r"#\s*Perspective[- ]taking\s*\n([\s\S]*?)(?=#|\Z)",
-            "draft_brainstorming":  r"#\s*Draft brainstorming\s*\n([\s\S]*?)(?=#|\Z)",
-            "draft":                r"#\s*Draft\s*\n([\s\S]*?)(?=--|\Z)",
+            "perspective_taking":   r"#\s*(?:Perspective[- ]taking|視点の共有|視点取り)\s*\n([\s\S]*?)(?=#|\Z)",
+            "draft_brainstorming":  r"#\s*(?:Draft brainstorming|下書きのブレインストーミング|ブレインストーミング)\s*\n([\s\S]*?)(?=#|\Z)",
+            "draft":                r"#\s*(?:Draft|下書き)\s*\n([\s\S]*?)(?=--|\Z)",
         }
 
-        # Accept straight (') **or** curly (’ U+2019) apostrophes
+        # Accept straight (’) **or** curly (‘ U+2019) apostrophes
+        # [JA-PATCH Fix-C1] Also accept Japanese section headers as fallback.
         rp_patterns = {
             "thinking_feeling":
-                r"#\s*I[’']m thinking & feeling\s*\n([\s\S]*?)(?=#|\Z)",
+                r"#\s*(?:I['’]m thinking & feeling|私は考えているし、感じている|私の思考と感情)\s*\n([\s\S]*?)(?=#|\Z)",
             "their_thinking_feeling":
-                r"#\s*They[’']re thinking & feeling\s*\n([\s\S]*?)(?=#|\Z)",
+                r"#\s*(?:They['’]re thinking & feeling|相手は考えているし、感じている|相手の思考と感情)\s*\n([\s\S]*?)(?=#|\Z)",
             "response":
-                r"#\s*My response\s*\n([\s\S]*?)(?=--|\Z)",
+                r"#\s*(?:My response|私の応答|私の返答)\s*\n([\s\S]*?)(?=--|\Z)",
         }
 
 
         # Determine which patterns to use