cleanups

Author: edgeinfinity1

docs/codex/certificate-repair-risk.md

@@ -10,6 +10,11 @@ MAICA 在 `game/Submods/MAICA_ChatSubmod/api.rpy` 的 `start_maica()` 中重新
 `store.mas_can_import.certifi()`；只有仍无法导入时才切换到 provider 2。MAICA
 不再通过后台线程从网络下载修复文件。
 
+迁移到 CertifiFixer 后，旧下载器中设置 `CERTIFI_RESTART_REQUIRED`（13418）的
+唯一调用点已删除，相应状态码、提示和对白也已移除。该数值不再用于当前状态定义。
+`CERTIFI_BROKEN`（13414）仍用于 MAICA 运行时检测：certifi 缺失、缺少 MAS 集成
+接口，或本地 CA bundle / SSL 上下文不可用时仍会触发。随包提供证书并不替代这些检查。
+
 随包文件需要与受支持的 MAS / Ren'Py Python 版本保持兼容。复制过程没有备份或
 回滚；若依赖复制后导入仍失败，MAICA 会切换 provider 2。目标目录不可写等
 未被 CertifiFixer 捕获的复制异常可能中断游戏初始化。

docs/codex/plaintext-provider-fallback.md

@@ -3,7 +3,7 @@
 ## 位置
 
 - `game/Submods/MAICA_ChatSubmod/header.rpy`：默认 `provider_id` 在 Windows 为 1，其他平台为 2。
-- `game/Submods/MAICA_ChatSubmod/api.rpy`：Android 迁移、certifi 检测失败或 certifi 下载失败时将 `provider_id` 设为 2。
+- `game/Submods/MAICA_ChatSubmod/api.rpy`：Android 迁移或启动时重新检查 certifi 导入失败时将 `provider_id` 设为 2。
 - `game/python-packages/maica_provider_manager.py`：节点列表提供 `wsInterface`/`httpInterface`，实际协议由节点数据决定。
 
 ## 原因与行为
@@ -18,4 +18,4 @@
 
 ## 本次处理边界
 
-本次保留明文 fallback 及其安全风险，但修复了 fallback 只写入 persistent、未同步运行中 provider 实例的问题；证书后台修复完成后也会重新触发可用性检查。后续若要收紧安全策略，应先提供设备信任根或用户明确确认机制，并单独评审可用性影响。
+fallback 会同时更新 persistent 和运行中的 provider 实例。证书修复已交由随包的 CertifiFixer 依赖处理；MAICA 不再后台下载修复文件，而是在启动时重新检查 certifi 导入，随后执行服务可用性检查。切换 provider 不会跳过 MAICA 的本地证书检查，导入或 CA bundle 仍不可用时会报告 `CERTIFI_BROKEN`。后续若要收紧安全策略，应先提供设备信任根或用户明确确认机制，并单独评审可用性影响。

game/Submods/MAICA_ChatSubmod/chat.rpy

@@ -1152,10 +1152,6 @@ label maica_connection_failure_dialogue(from_mspire = False, status_code = None,
         m 2rusdlb "...Certification issue? Maybe this isn't a clean installation?"
         m 3eusdlb "Try the MAS native 'update certification' function, some other submods could break these as I know."
 
-    elif failure_status == ai.MaicaAiStatus.CERTIFI_RESTART_REQUIRED:
-        m 2rusdlb "...Uh, seems I have to apply a quick fix on the certification."
-        m 3eua "It needs a restart to take effect, then we can try again."
-
     elif failure_status == ai.MaicaAiStatus.VERSION_OLD:
         m 2rusdlb "...You have to update the submod once in a while, [player]!"
         m 3eusdlb "This version is too old to work already, update it whenever you have some time."

game/Submods/MAICA_ChatSubmod/tl/chat.rpy

@@ -684,18 +684,6 @@ translate chinese maica_connection_failure_dialogue_9bd9d974:
     # m 3eusdlb "Try the MAS native 'update certification' function, some other submods could break these as I know."
     m 3eusdlb "先试试MAS自带的'更新证书'吧, 有些其它子模组容易弄出这种问题."
 
-# game/Submods/MAICA_ChatSubmod/chat.rpy:1049
-
-translate chinese maica_connection_failure_dialogue_88ceabec:
-    # m 2rusdlb "...Uh, seems I have to apply a quick fix on the certification."
-    m 2rusdlb "...呃, 我还得处理一下证书的问题."
-
-# game/Submods/MAICA_ChatSubmod/chat.rpy:1050
-
-translate chinese maica_connection_failure_dialogue_21148eba:
-    # m 3eua "It needs a restart to take effect, then we can try again."
-    m 3eua "重启一下游戏才能生效, 然后我们再试试."
-
 translate chinese maica_connection_failure_dialogue_8171d2d7:
     # m 2rusdlb "...You have to update the submod once in a while, [player]!"
     m 2rusdlb "...[player], 你总得更新一下子模组的!"

game/Submods/MAICA_ChatSubmod/tl/maica_description.rpy

@@ -25,7 +25,6 @@ translate chinese python in maica:
             maica_instance.MaicaAiStatus.FAILED_GET_NODE: u"获取服务节点失败, 服务器可能正在维护或离线",
             maica_instance.MaicaAiStatus.VERSION_OLD: u"检测到安装版本过旧, 请更新到最新版",
             maica_instance.MaicaAiStatus.NO_INTERNET: u"检测到子模组离线. 请根据Readme重新检查安装和网络连接",
-            maica_instance.MaicaAiStatus.CERTIFI_RESTART_REQUIRED: u"执行了证书修复, 请重启以生效",
         })
         store.mas_setEVLPropValues(
             "maica_main",

game/python-packages/maica.py

@@ -126,7 +126,6 @@ class MaicaAiStatus:
         FAILED_GET_NODE = 13415
         VERSION_OLD = 13416
         NO_INTERNET = 13417
-        CERTIFI_RESTART_REQUIRED = 13418
 
         @classmethod
         def is_submod_exception(cls, code):
@@ -191,7 +190,6 @@ def from_protocol_status(cls, status, fallback=None, code=None):
             FAILED_GET_NODE:u"Failed to retrieve an available service provider",
             VERSION_OLD:u"Submod version outdated, update required",
             NO_INTERNET:u"No internet connection available",
-            CERTIFI_RESTART_REQUIRED:u"A certificate fix was applied; restart the game to apply it",
         }
 
         @classmethod
@@ -891,7 +889,6 @@ def _preserve_or_set_availability_error(self, message):
             self.MaicaAiStatus.VERSION_OLD,
             self.MaicaAiStatus.NO_INTERNET,
             self.MaicaAiStatus.CONNECT_PROBLEM,
-            self.MaicaAiStatus.CERTIFI_RESTART_REQUIRED,
         )
         if self.status not in availability_failures:
             self.set_error(

…/test_start_maica_background_download.py tests/test_start_maica.pytests/test_start_maica_background_download.py renamed to tests/test_start_maica.py tests/test_start_maica_background_download.py renamed to tests/test_start_maica.py

@@ -20,6 +20,7 @@ def test_start_maica_rechecks_certifi_after_fixer_then_falls_back_on_failure():
     assert "if not store.mas_can_import.certifi():\n            maica_set_plain_provider()" in start_maica
     assert "maica_start_certifi_download_in_background" not in source
     assert "maica_download_certifi_files" not in source
+    assert "maica_certifi_download_thread_running" not in source
     assert "maica_can_update_cacert" not in source
 
 

tests/test_translation_source_language.py

@@ -211,7 +211,7 @@ def test_maica_description_status_and_event_overrides_are_chinese():
         'MaicaAiStatus.TOKEN_INVALID: u"账号或密码无效"',
         'MaicaAiStatus.VERSION_OLD: u"检测到安装版本过旧, 请更新到最新版"',
         'MaicaAiStatus.NO_INTERNET: u"检测到子模组离线',
-        'MaicaAiStatus.CERTIFI_RESTART_REQUIRED: u"执行了证书修复, 请重启以生效"',
+        'MaicaAiStatus.CERTIFI_BROKEN: u"SSL/TLS已损坏, 可能由其他子模组导致. 需要完全重新安装MAS"',
         'prompt="我们去天堂树林吧", category=["你", "我们", "模组", "MAICA"]',
         'prompt="关于\'MVista\'", category=["你", "我们", "模组", "MAICA"]',
     ]

tests/test_v13_contract_runtime.py

@@ -507,8 +507,8 @@ def test_maica_status_inventory_excludes_retired_state_machine_codes():
     assert status.WAIT_AVAILABILITY == 10010
     assert status.WEBSOCKET_CONNECTING == 10020
     assert status.CONNECTED == 10302
-    assert status.CERTIFI_RESTART_REQUIRED == 13418
-    assert status.CERTIFI_RESTART_REQUIRED != status.SERVER_REJECTED
+    assert status.CERTIFI_BROKEN == 13414
+    assert 13418 not in status._descriptions
 
     retired_names = (
         "WAIT_AUTH",
@@ -529,6 +529,7 @@ def test_maica_status_inventory_excludes_retired_state_machine_codes():
         "WAIT_SETTING_RESPONSE",
         "TOKEN_MAX_EXCEEDED",
         "TOKEN_WARN_EXCEEDED",
+        "CERTIFI_RESTART_REQUIRED",
     )
     assert not [name for name in retired_names if hasattr(status, name)]
     assert not hasattr(status, "MAIKA_PREFIX")