@@ -34,7 +34,8 @@ define _maica_selected_visuals = []
 #    "mpostal_attachment_path":"",
 #    "vista_image_info":{},
 #    "responsed_content": "",
-#    "responsed_status":"delaying|notupload|received|readed|failed|fatal",
+#    "responsed_status":"delaying|notupload|received|readed|failed|newfatal|fatal",
+#    "retry_after": None,
 #    "failure_status": None,
 #    "failure_protocol_status": None,
 #    "failure_protocol_code": None,
 
@@ -491,10 +491,20 @@ init 5 python:
 
     def is_mail_waiting_reply():
         for i in persistent._maica_send_or_received_mpostals:
-            if i["responsed_status"] in ("received", "failed"):
+            if i["responsed_status"] in ("received", "failed", "newfatal"):
                 return True
         return False
 
+    def maica_retry_mpostal(postal, reset_count=False):
+        """Delay the next attempt without changing the original letter time."""
+        import time
+        postal["retry_after"] = (
+            time.time() + persistent.maica_setting_dict["mpostal_default_reply_time"] * 60
+        )
+        postal["responsed_status"] = "delaying"
+        if reset_count:
+            postal["failed_count"] = 0
+
     @store.mas_submod_utils.functionplugin("ch30_loop", priority=-100)
     def push_mpostal_reply():
         if (
@@ -516,6 +526,12 @@ init 5 python:
             if wait_replying_count > 3:
                 min_response_time *= 2
             if i["responsed_status"] == "delaying":
+                # Retries wait a full interval after the failure is acknowledged.
+                if i.get("retry_after") is not None:
+                    if time.time() >= i["retry_after"]:
+                        i["responsed_status"] = "notupload"
+                        i.pop("retry_after", None)
+                    continue
                 # 时间计算
                 last_sesh_ed = persistent.sessions.get("last_session_end", datetime.datetime.now())
 
@@ -530,7 +546,7 @@ init 5 python:
                 if time.time() - float(i['time']) > min_response_time:
                     i["responsed_status"] = "notupload"
 
-            elif i["responsed_status"] in ("received", "failed"):
+            elif i["responsed_status"] in ("received", "failed", "newfatal"):
                 wait_replying_count += 1
 
         return
@@ -1070,9 +1086,9 @@ label .talking_start:
     call clear_all
     return
 
-label maica_connection_failure_dialogue(from_mspire = False, status_code = None):
+label maica_connection_failure_dialogue(from_mspire = False, status_code = None, fallback_to_current = True):
     $ ai = store.maica.maica_instance
-    $ failure_status = ai.status if status_code is None else status_code
+    $ failure_status = ai.status if (status_code is None and fallback_to_current) else status_code
 
     if failure_status == ai.MaicaAiStatus.TOKEN_MISSING:
         m 2rusdlb "...It seems you haven't got a token yet."
@@ -1467,35 +1483,33 @@ label maica_mpostal_received:
 # 在重启后加入事件队列等待推送，随机对话频率设置为0将永远不推送
 label maica_mpostal_replyed:
     $ ev = mas_getEV("maica_mpostal_replyed")
-    python:
-
-        def _curr_count():
-            curr_queue_count = 0
-            for i in persistent._maica_send_or_received_mpostals:
-                if i["responsed_status"] == "received":
-                    curr_queue_count += 1
-            return curr_queue_count
-
     $ seq = 0
+    $ all_seq = 0
+    $ mpostal_shown_count = 0
 
     # 这里是生成结果
-label maica_mpostal_replyed.select_letter(is_repeat=False):
+label maica_mpostal_replyed.select_letter:
+    $ is_repeat = False
     $ current = None
     python:
         for letter in persistent._maica_send_or_received_mpostals:
-            if letter["responsed_status"] in ["received", "failed", "notupload"]:
+            all_seq += 1
+            # If there's "notupload" in queue, we generate them together to make game experience smoother
+            # Though those don't actively trigger mpostal_replyed
+            if letter["responsed_status"] in ["received", "failed", "newfatal", "notupload"]:
                 current = letter
                 break
     if current is None:
         jump maica_mpostal_replyed.end
-
-label maica_mpostal_replyed.start:
     $ seq += 1
 
+label maica_mpostal_replyed.start:
     # This method iters over ALL history letters.
     # That means we cannot include "fatal"s in, because they'd come up every time before manually handled.
     # So we only write reactions for non-stale status.
-    if current["responsed_status"] in ("failed"):
+
+    # newfatal is acknowledged once, then kept as fatal for manual handling.
+    if current["responsed_status"] in ("failed", "newfatal"):
         if not is_repeat:
             if seq <= 1:
                 m 2lksdlb "Uh, [player], {w=0.5}about your last letter."#担心
@@ -1506,12 +1520,17 @@ label maica_mpostal_replyed.start:
             m 2lksdlb "Uh, [player], I'm really sorry but the Heaven Forest seems not working now."
             m 2ekc "Let me see..."
 
-        call maica_connection_failure_dialogue(status_code = current.get("failure_status"))
+        $ failure_status = current.get("failure_status")
+        $ fallback_to_current = "failure_status" not in current
+        call maica_connection_failure_dialogue(status_code = failure_status, fallback_to_current = fallback_to_current)
         if current["responsed_status"] == "failed":
             m 1eua "It's okay, I'll remember to write you back as soon as you address that issue."
-            $ current["responsed_status"] = "notupload"
+            $ maica_retry_mpostal(current)
+        elif current["responsed_status"] == "newfatal":
+            m 1eksdla "I tried several times on this one but without success. But you can still use the 'Resend mail' button in 'Reread MPostal letters' menu, to let me try again."
+            $ current["responsed_status"] = "fatal"
 
-    elif current["responsed_status"] in ("received"):
+    elif current["responsed_status"] == "received":
         if seq <= 1:
             m 7hub "Oh, [player]! {w=0.5}I've finished writing you my reply!"
         else:
@@ -1522,8 +1541,9 @@ label maica_mpostal_replyed.start:
 
         call maica_mpostal_show(current["responsed_content"])
         $ current["responsed_status"] = "readed"
+        $ mpostal_shown_count += 1
 
-    elif current["responsed_status"] in ("notupload"):
+    elif current["responsed_status"] == "notupload":
         if seq <= 1:
             m 3eksdlb "Oh, your letter [player]! I was kind of in a hurry so it's not completely ready yet."#尴尬
         else:
@@ -1533,26 +1553,29 @@ label maica_mpostal_replyed.start:
         show black with dissolve
         call maica_mpostal_read
 
-        if _return == "failed":
+        if current["responsed_status"] != "received":
             hide black with dissolve
-            # 直接重新开始, 失败的信会提示失败, 理论应与current一致
-            jump maica_mpostal_replyed.select_letter(is_repeat=True)
+            # The batch result belongs to all letters; inspect this letter only.
+            $ is_repeat = True
+            jump maica_mpostal_replyed.start
 
         m "Okay, here it is!"
         hide black with dissolve
         call maica_mpostal_show(current["responsed_content"])
         $ current["responsed_status"] = "readed"
+        $ mpostal_shown_count += 1
 
     jump maica_mpostal_replyed.select_letter
 
 label maica_mpostal_replyed.end:
+    if not mpostal_shown_count:
+        return "no_unlock"
     if ev.shown_count <= 2:
         m 2lksdlb "I have to admit that I'm not quite used to writing here, but I hope it's not too bad!"
     elif ev.shown_count <= 4:
         m 2lksdlb "May not as good as my former poems though, but I really tried. Hope you like it!"
     else:
-        $ it = renpy.substitute(_("it") if seq <= 1 else _("these"))
-        m 2tublu "I have to assume you're loving {it} now, since you did write to me a lot!"
+        m 2tublu "I have to assume you're loving these now, since you did write to me a lot!"
     m 5ekbsa "And welcome writing to me again anytime you like!"
     return "no_unlock"
 
 
@@ -382,39 +382,66 @@ label maica_connect_from_settings:
     return
 
 label maica_mpostal_read:
+    $ renpy.dynamic("mpostal_read_result")
+    $ mpostal_read_result = "success"
     $ mas_HKBRaiseShield()
     if persistent.maica_setting_dict.get("show_console_when_reply", False):
         call maica_show_console
     else:
         window hide
     call maica_mpostal_load
-    call maica_init_connect(use_pause_instand_wait = True)
-    if _return == "disconnected":
-        jump maica_mpostal_read.failed
-
     python:
         ai = store.maica.maica_instance
-        import time
+        import bot_interface
         import traceback
 
-        def _save_mpostal_failure_snapshot(postal):
+        def _save_mpostal_failure_snapshot(postal, error=None):
             """Keep the request failure details with the postal that caused them."""
-            postal["failure_status"] = getattr(ai, "status", None)
-            postal["failure_protocol_status"] = getattr(ai, "error_protocol_status", None)
-            postal["failure_protocol_code"] = getattr(ai, "error_protocol_code", None)
-            failure_message = getattr(ai, "error_message", None)
+            # Local setup errors do not update ai.status. Do not attribute them
+            # to an earlier request or to the current healthy connection.
+            postal["failure_status"] = getattr(ai, "status", None) if error is None else None
+            postal["failure_protocol_status"] = (
+                getattr(ai, "error_protocol_status", None) if error is None
+                else "client_mpostal_failed"
+            )
+            postal["failure_protocol_code"] = getattr(ai, "error_protocol_code", None) if error is None else None
+            failure_message = getattr(ai, "error_message", None) if error is None else error
             postal["failure_message"] = (
-                None if failure_message is None else u"{}".format(failure_message)
+                None if failure_message is None else bot_interface.to_unicode(failure_message)
             )
 
+        def _record_mpostal_failure(postal, error=None):
+            _save_mpostal_failure_snapshot(postal, error)
+            postal["responsed_status"] = "failed"
+            postal["failed_count"] = postal.get("failed_count", 0) + 1
+            if postal["failed_count"] >= 3:
+                postal["responsed_status"] = "newfatal"
+                postal["responsed_content"] = renpy.substitute(
+                    _("Failed replying mail. Not retrying because failure count limit reached")
+                ) + "\n" + (postal.get("responsed_content") or "")
+                store.mas_submod_utils.submod_log.error(
+                    "label maica_mpostal_read: retry limit reached for '{}'".format(
+                        postal["raw_title"]
+                    )
+                )
+
         pending_postals = [
             postal
             for postal in persistent._maica_send_or_received_mpostals
             if postal["responsed_status"] == "notupload"
         ]
+
+    call maica_init_connect(use_pause_instand_wait = True)
+    if _return != "success":
+        python:
+            mpostal_read_result = "failed"
+            for cur_postal in pending_postals:
+                _record_mpostal_failure(cur_postal)
+        jump maica_mpostal_read.failed
+
+    python:
         total_pending = len(pending_postals)
         for current_index, cur_postal in enumerate(pending_postals, 1):
-            start_time = time.time()
             try:
                 vista_info = cur_postal.get("vista_image_info") or {}
                 uuid = vista_info.get("uuid")
@@ -424,17 +451,10 @@ label maica_mpostal_read:
                         uuid = store.maica.upload_vista_image(image_source)
                         cur_postal['vista_image_info'] = ai.vista_manager.get_info(uuid)
                 ai.start_MPostal(cur_postal["raw_content"], title=cur_postal["raw_title"], visions = [ai.generate_vista_url(uuid)] if uuid else None)
-            except Exception:
-                _save_mpostal_failure_snapshot(cur_postal)
-                cur_postal["responsed_status"] = "failed"
-                cur_postal["failed_count"] = cur_postal.get("failed_count", 0) + 1
-                _return = "failed"
+            except Exception as error:
+                _record_mpostal_failure(cur_postal, error)
+                mpostal_read_result = "failed"
                 store.mas_submod_utils.submod_log.error("label maica_mpostal_read: request setup failed: {}".format(traceback.format_exc()))
-                if cur_postal["failed_count"] >= 3:
-                    cur_postal["responsed_status"] = "fatal"
-                    cur_postal["responsed_content"] = renpy.substitute(_("Failed replying mail. Not retrying because failure count limit reached")) + "\n" + cur_postal["responsed_content"]
-                    store.mas_submod_utils.submod_log.error("label maica_mpostal_read: retry limit reached for '{}'".format(cur_postal["raw_title"]))
-                    break
                 continue
 
             ai.console_logger.info("<Function> Processing mpostal {} ({}/{})".format(cur_postal["raw_title"], current_index, total_pending))
@@ -456,35 +476,26 @@ label maica_mpostal_read:
                 message = ai.get_message()
                 cur_postal["responsed_content"] = message[1]
                 cur_postal["responsed_status"] = "received"
-                _return = "success"
 
             if ai.is_failed():
-                _save_mpostal_failure_snapshot(cur_postal)
-                cur_postal["responsed_status"] = "failed"
-                cur_postal["responsed_content"] += renpy.substitute(_("Failed replying mail, check submod_log.log for details\nError code: [ai.status] | [ai.MaicaAiStatus.get_description(ai.status)]"))
-                _return = "failed"
+                cur_postal["responsed_content"] = (cur_postal.get("responsed_content") or "") + renpy.substitute(_("Failed replying mail, check submod_log.log for details\nError code: [ai.status] | [ai.MaicaAiStatus.get_description(ai.status)]"))
+                _record_mpostal_failure(cur_postal)
+            elif cur_postal["responsed_status"] != "received":
+                _record_mpostal_failure(
+                    cur_postal, "MPostal request ended without a reply"
+                )
 
-            if _return == "success" and cur_postal["responsed_status"] == "received":
+            if cur_postal["responsed_status"] == "received":
                 store.maica.delete_mpostal_original(cur_postal)
-
-            if _return != 'success':
-                if cur_postal.get("failed_count", 0) >= 3:
-                    cur_postal["responsed_status"] = "fatal"
-                    cur_postal["responsed_content"] = renpy.substitute(_("Failed replying mail. Not retrying because failure count limit reached")) + "\n" +cur_postal["responsed_content"]
-                    store.mas_submod_utils.submod_log.error("label maica_mpostal_read: retry limit reached for '{}'".format(cur_postal["raw_title"]))
-                    break
-                else:
-                    if "failed_count" not in cur_postal:
-                        cur_postal["failed_count"] = 0
-                    cur_postal["failed_count"] += 1
-
+            else:
+                mpostal_read_result = "failed"
 
 label maica_mpostal_read.failed:
     call maica_hide_console
     if not persistent.maica_setting_dict.get("show_console_when_reply", False):
         window show
     $ mas_HKBRaiseShield()
-    return _return
+    return mpostal_read_result
 
 
 label maica_mpostal_show(content = "no content"):
 
@@ -1107,9 +1107,9 @@ screen maica_mpostals():
                                         Function(_maica_call_in_new_context_preserve_layers, "maica_mpostal_show_backtoscreen", postal["responsed_content"])
                                 ]
 
-                        if postal["responsed_status"] in ("fatal"):
+                        if postal["responsed_status"] == "fatal":
                             textbutton _("Resend mail"):
-                                action SetDict(postal, "responsed_status", "delaying")
+                                action Function(maica_retry_mpostal, postal, reset_count=True)
                         hbox:
                             textbutton _("Delete"):
                                 action Function(_delete_postal, postal)