release(v1.0.7): 切换 Graph 备注回写到开放接口

Graph 接口模式改为 PATCH /api/open/accounts/:id/remark，仅发送 remark；并限制备注回写仅在 graph+api 模式触发，同时在 README 标注 microsoft-account-manager 对接地址。

Author: Msg-Lbo

README.md

@@ -10,6 +10,12 @@ CodeX Register 是一个本地桌面化控制台，用于统一执行注册流
 
 ## 0. 更新日志
 
+### v1.0.7 (2026-04-06)
+
+- Graph 接口模式账号备注更新切换为开放接口：`PATCH /api/open/accounts/:id/remark`。
+- 备注更新请求体改为最小负载：`{"remark":"已注册"}`，不再依赖全量账号字段。
+- 保持 token 鉴权与错误提示一致，注册链路中的“已注册账号”仍会自动回写备注。
+
 ### v1.0.6 (2026-04-06)
 
 - Issue: #7 — Graph 接口模式注册链路异常（区域限制误归因、已注册账号处理、邮箱 OTP 重试策略）。
@@ -108,6 +114,7 @@ python gui.py --mode browser --no-auto-open
 - MailFree / Cloudflare Temp / CloudMail 可配置域名策略（随机域名、白名单、自定义 local-part）。
 - Luckyous API 支持按项目编码自动下单邮箱并轮询验证码。
 - Graph 支持文件模式与接口模式：文件模式使用账号文件；接口模式使用项目地址 + token。
+- Graph 接口模式推荐对接 `microsoft-account-manager`：`https://github.com/Msg-Lbo/microsoft-account-manager`。
 - Gmail 模式需使用应用专用密码（非登录密码）。
 
 ### 5.3 MailFree 域名配置（Cloudflare DNS）
@@ -236,7 +243,7 @@ Cloudflare Token 要求（用于域名配置页读取 Zone 和管理 CNAME）：
 | `gmail_alias_mix_googlemail` | bool | `true` | 混用 gmail/googlemail 域名 |
 | `graph_accounts_mode` | string | `file` | Graph 账号来源：`file` / `api` |
 | `graph_accounts_file` | string | `""` | Graph 账号文件路径 |
-| `graph_api_base_url` | string | `""` | Graph 接口模式地址 |
+| `graph_api_base_url` | string | `""` | Graph 接口模式地址（推荐 `microsoft-account-manager` 项目地址） |
 | `graph_api_token` | string | `""` | Graph 接口模式 token |
 | `graph_tenant` | string | `common` | Graph tenant |
 | `graph_fetch_mode` | string | `graph_api` | `graph_api` / `imap_xoauth2` |

VERSION

@@ -1 +1 @@
-1.0.6
+1.0.7

codex_register/mail_services.py

@@ -2772,58 +2772,6 @@ def _find_account(self, mailbox: str) -> dict[str, Any]:
             raise MailServiceError(f"Graph 接口账号池中不存在该邮箱: {target}")
         raise MailServiceError(f"Graph 账号文件中不存在该邮箱: {target}")
 
-    @staticmethod
-    def _extract_api_account_payload(payload: Any) -> dict[str, Any]:
-        if isinstance(payload, dict):
-            for key in ("data", "item", "account", "result", "row"):
-                val = payload.get(key)
-                if isinstance(val, dict):
-                    return val
-            return payload
-        if isinstance(payload, list):
-            for it in payload:
-                if isinstance(it, dict):
-                    return it
-        return {}
-
-    @staticmethod
-    def _pick_str_value(*pairs: tuple[dict[str, Any], tuple[str, ...]]) -> str:
-        for src, keys in pairs:
-            if not isinstance(src, dict):
-                continue
-            for key in keys:
-                val = src.get(key)
-                if val is None:
-                    continue
-                text = str(val).strip()
-                if text:
-                    return text
-        return ""
-
-    def _load_api_account_detail(self, account_id: str, *, proxies: Any = None) -> dict[str, Any]:
-        aid = str(account_id or "").strip()
-        if not aid:
-            return {}
-        status, payload, text = self._api_request(
-            "GET",
-            f"/api/accounts/{urllib.parse.quote(aid, safe='')}",
-            proxies=proxies,
-            timeout=25,
-        )
-        if status == 404:
-            return {}
-        if not (200 <= status < 300):
-            if self._is_api_token_invalid(status, payload, text):
-                raise MailServiceError(
-                    "Graph 接口模式鉴权失败：开放接口 token 无效。"
-                    "请检查 graph_api_token 是否与上游 MAIL_API_TOKEN 一致。"
-                )
-            detail = self._api_error_message(payload, text)
-            raise MailServiceError(
-                f"Graph 接口读取账号详情失败: /api/accounts/{aid} HTTP {status}: {detail or text}"
-            )
-        return self._extract_api_account_payload(payload)
-
     def mark_account_registered(
         self,
         mailbox: str,
@@ -2843,69 +2791,28 @@ def mark_account_registered(
         if not account_id:
             return False
 
-        detail = {}
-        try:
-            detail = self._load_api_account_detail(account_id, proxies=proxies)
-        except Exception:
-            detail = {}
-
-        account_val = self._pick_str_value(
-            (detail, ("account", "email", "address", "mailbox")),
-            (acc, ("email",)),
-        )
-        password_val = self._pick_str_value(
-            (detail, ("password",)),
-            (acc, ("password",)),
-        )
-        client_id_val = self._pick_str_value(
-            (detail, ("clientId", "client_id")),
-            (acc, ("client_id", "clientId")),
-        )
-        refresh_token_val = self._pick_str_value(
-            (detail, ("refreshToken", "refresh_token")),
-            (acc, ("refresh_token", "refreshToken")),
-        )
-        if not account_val or "@" not in account_val:
-            account_val = target
-
-        missing: list[str] = []
-        if not account_val:
-            missing.append("account")
-        if not password_val:
-            missing.append("password")
-        if not client_id_val:
-            missing.append("clientId")
-        if not refresh_token_val:
-            missing.append("refreshToken")
-        if missing:
-            raise MailServiceError(
-                "Graph 接口更新账号备注失败：缺少字段 "
-                + ", ".join(missing)
-            )
-
         body = {
-            "account": account_val,
-            "password": password_val,
-            "clientId": client_id_val,
-            "refreshToken": refresh_token_val,
             "remark": str(remark or "已注册").strip() or "已注册",
         }
         status, payload, text = self._api_request(
-            "PUT",
-            f"/api/accounts/{urllib.parse.quote(account_id, safe='')}",
+            "PATCH",
+            f"/api/open/accounts/{urllib.parse.quote(account_id, safe='')}/remark",
             json_body=body,
             proxies=proxies,
             timeout=25,
         )
         if not (200 <= status < 300):
+            if self._is_api_token_invalid(status, payload, text):
+                raise MailServiceError(
+                    "Graph 接口模式鉴权失败：开放接口 token 无效。"
+                    "请检查 graph_api_token 是否与上游 MAIL_API_TOKEN 一致。"
+                )
             detail_msg = self._api_error_message(payload, text)
             raise MailServiceError(
-                f"Graph 接口更新账号备注失败: /api/accounts/{account_id} HTTP {status}: {detail_msg or text}"
+                "Graph 接口更新账号备注失败: "
+                f"/api/open/accounts/{account_id}/remark HTTP {status}: {detail_msg or text}"
             )
 
-        acc["password"] = password_val
-        acc["client_id"] = client_id_val
-        acc["refresh_token"] = refresh_token_val
         acc["remark"] = body["remark"]
         return True
 

codex_register/r_with_pwd.py

@@ -295,6 +295,15 @@ def _mark_graph_registered_email(
     proxies: Any = None,
     remark: str = "已注册",
 ) -> bool:
+    provider_now = normalize_mail_provider(
+        os.getenv("MAIL_SERVICE_PROVIDER", MAIL_SERVICE_PROVIDER)
+    )
+    if provider_now != "graph":
+        return False
+    graph_mode = str(os.getenv("GRAPH_ACCOUNTS_MODE", "file") or "file").strip().lower()
+    if graph_mode != "api":
+        return False
+
     target = str(email or "").strip().lower()
     if not target or "@" not in target:
         return False