chore: account-manager — runtime_env sibling root, wait-login and browser fixes

scripts/service/browser_service.py

@@ -7,7 +7,7 @@ import tempfile
 import time
 from urllib.parse import urlparse
 
-from db.accounts_repo import get_account_by_id, mark_login_status
+from db.accounts_repo import get_account_by_id, touch_account_updated_at
 from util.logging_config import (
     get_skill_logger,
     get_skill_log_file_path,
@@ -132,7 +132,7 @@ def _run_login_browser_session(
     """
     启动 Playwright 登录检测子进程；**是否已登录以子进程 DOM 判定为准**。
 
-    成功后尽力 `mark_login_status` 供 list/排序展示，**跨技能编排请勿再依赖该字段**（可能与真实 Cookie 会话脱节）。
+    若 DOM 判定成功则刷新该账号 `updated_at`，便于 `pick-web` 等按最近活跃选号；**是否已登录仅以本次检测为准**。
 
     返回 (是否已登录成功, end_reason)：end_reason 为 login_child 写入的 reason，失败时可能为
     timeout / user_closed / subprocess_error。
@@ -218,21 +218,48 @@ def _run_login_browser_session(
         json.dump(cfg, jf, ensure_ascii=False)
         cfg_path = jf.name
     proc_rc = None
+    child_hard_timeout = False
+    child_stderr = ""
+    child_stdout = ""
     try:
         r = subprocess.run(
             [sys.executable, login_runner_path, cfg_path],
             timeout=timeout_sec + 180,
             env=subprocess_env_with_trace(),
+            capture_output=True,
+            text=True,
+            encoding="utf-8",
+            errors="replace",
         )
         proc_rc = r.returncode
+        child_stderr = (r.stderr or "").strip()
+        child_stdout = (r.stdout or "").strip()
+        if child_stderr:
+            log.warning(
+                "login_child_stderr account_id=%s len=%s tail=%s",
+                account_id,
+                len(child_stderr),
+                child_stderr[-6000:],
+            )
+        if child_stdout and proc_rc != 0:
+            log.warning(
+                "login_child_stdout account_id=%s len=%s tail=%s",
+                account_id,
+                len(child_stdout),
+                child_stdout[-2000:],
+            )
         if proc_rc != 0:
             if verbose_ui:
-                print("⚠️ 浏览器进程异常退出，将仅根据已写入的检测结果更新状态")
-            log.warning("login_subprocess_nonzero_return code=%s", proc_rc)
+                print("⚠️ 浏览器子进程非零退出，以结果 JSON 为准（若已写入）")
+            log.info(
+                "login_subprocess_nonzero_return code=%s (exit code 不单独作为成败依据，见 result JSON)",
+                proc_rc,
+            )
     except subprocess.TimeoutExpired as ex:
+        child_hard_timeout = True
         if verbose_ui:
-            print("⚠️ 等待浏览器超时，将仅根据已写入的检测结果更新状态")
-        log.warning("login_subprocess_timeout err=%s", ex)
+            print("⚠️ 浏览器子进程等待超时，按「限时内未完成登录」处理")
+        log.warning("login_subprocess_hard_timeout err=%s", ex)
     finally:
         try:
             os.unlink(cfg_path)
@@ -240,16 +267,37 @@ def _run_login_browser_session(
             pass
 
     interactive_ok = False
-    end_reason = "subprocess_error"
+    end_reason = "timeout" if child_hard_timeout else "subprocess_error"
+    child_detail = ""
     try:
         with open(result_path, encoding="utf-8") as rf:
             data = json.load(rf)
             interactive_ok = bool(data.get("interactive_ok"))
-            end_reason = str(data.get("end_reason") or "").strip() or (
-                "login_ok" if interactive_ok else "timeout"
-            )
-    except Exception:
-        end_reason = "subprocess_error"
+            er = str(data.get("end_reason") or "").strip()
+            if er:
+                end_reason = er
+            elif interactive_ok:
+                end_reason = "login_ok"
+            elif not child_hard_timeout:
+                end_reason = "timeout"
+            child_detail = str(data.get("detail") or "").strip()
+        if child_detail:
+            log.warning("login_child_result_detail account_id=%s detail=%s", account_id, child_detail[:8000])
+    except Exception as read_ex:
+        log.error(
+            "login_child_result_read_failed account_id=%s err=%s proc_rc=%s stderr_tail=%s",
+            account_id,
+            read_ex,
+            proc_rc,
+            (child_stderr or "")[-3000:],
+        )
+        if child_hard_timeout:
+            end_reason = "timeout"
+            interactive_ok = False
+        elif proc_rc is not None and proc_rc != 0:
+            end_reason = "child_crash"
+        else:
+            end_reason = "subprocess_error"
     try:
         os.unlink(result_path)
     except OSError:
@@ -265,7 +313,8 @@ def _run_login_browser_session(
         proc_rc,
         ok,
     )
-    mark_login_status(account_id, ok)
+    if ok:
+        touch_account_updated_at(account_id)
     return ok, end_reason if not ok else "login_ok"
 
 
@@ -282,7 +331,7 @@ def cmd_login(account_id):
     ok, _end_reason = _run_login_browser_session(target, timeout_sec, verbose_ui=True)
     log_file = get_skill_log_file_path()
     if ok:
-        print("✅ 已判定登录成功，状态已写入数据库")
+        print("✅ 已判定页面登录成功")
     else:
         log.warning(
             "login_not_detected account_id=%s platform=%s see_log=%s",
@@ -290,29 +339,23 @@ def cmd_login(account_id):
             (target.get("platform") or "").strip().lower(),
             log_file,
         )
-        print("⚠️ 未检测到有效登录，状态为未登录。请关闭其他占用该用户目录的浏览器后重试，或延长 JIANGCHANG_LOGIN_TIMEOUT_SECONDS 后再登录。")
+        print("⚠️ 未检测到有效登录。请关闭其他占用该用户目录的浏览器后重试，或延长 JIANGCHANG_LOGIN_TIMEOUT_SECONDS 后再登录。")
         print(f"ℹ️ 详细轮询日志见：{log_file}（可将 JIANGCHANG_LOG_LEVEL=DEBUG 打开更细粒度）")
 
 
-def cmd_wait_login(account_id, force: bool = False) -> int:
+def cmd_wait_login(account_id) -> int:
     """
-    跨技能编排：若未登录则打开浏览器并在限时内等待登录。
-    返回 0：已登录（原本已登录或本次登录成功）；1：失败（超时 / 用户关浏览器 / 其它）。
+    跨技能编排：始终以本次 Playwright DOM 检测为准；限时内打开浏览器并等待用户完成登录。
+    返回 0：本次检测判定已登录；1：失败（超时 / 用户关浏览器 / 其它）。
     stdout 含 OK:WAIT_LOGIN 或 ERROR:WAIT_LOGIN_*。
-
-    force=True：即使库内 login_status=1 也仍打开浏览器并限时检测（供搜狐发布等「页面仍要求登录」场景）。
     """
     log = get_skill_logger()
-    log.info("wait_login_command account_id=%r force=%s", account_id, force)
+    log.info("wait_login_command account_id=%r", account_id)
     target = get_account_by_id(account_id)
     if not target:
         log.warning("wait_login_aborted account_not_found account_id=%r", account_id)
         print("ERROR:ACCOUNT_NOT_FOUND")
         return 1
-    # 库内 login_status=1 时跳过开窗（与真实 Cookie 可能不同步时用 force=True）
-    if int(target.get("login_status") or 0) == 1 and not force:
-        print("OK:WAIT_LOGIN")
-        return 0
 
     if not resolve_chromium_channel():
         _print_browser_install_hint()
@@ -327,9 +370,28 @@ def cmd_wait_login(account_id, force: bool = False) -> int:
         return 1
 
     sec = _wait_login_timeout_seconds()
+    log.info(
+        "wait_login_orchestration account_id=%s name=%r timeout_sec=%s",
+        target.get("id"),
+        target.get("name"),
+        sec,
+    )
+    print("INFO:WAIT_LOGIN_BEGIN", flush=True)
     print(
-        f"⏳ 账号「{target.get('name', target['id'])}」尚未登录，将打开浏览器；请在 {sec} 秒内完成登录。"
-        "关闭浏览器将视为放弃。"
+        f"账号管理（account-manager）正在为本账号执行登录检测：将打开浏览器，请在 {sec} 秒内在窗口中完成登录。",
+        flush=True,
+    )
+    print(
+        "说明：调用方/编排技能只需等待本进程结束；打开浏览器与 DOM 检测均由账号管理负责。",
+        flush=True,
+    )
+    print(
+        "· 超时未登录成功 → 本进程报错退出，请中止后续业务。",
+        flush=True,
+    )
+    print(
+        "· 提前关闭浏览器 → 视为放弃登录，本进程立即报错退出。",
+        flush=True,
     )
     ok, end_reason = _run_login_browser_session(target, sec, verbose_ui=False)
     if ok:
@@ -350,6 +412,37 @@ def cmd_wait_login(account_id, force: bool = False) -> int:
     if end_reason == "no_channel":
         _print_browser_install_hint()
         return 1
+    if end_reason == "launch_failed":
+        print(
+            "ERROR:WAIT_LOGIN_LAUNCH_FAILED 无法启动浏览器或创建用户数据上下文，请确认本机 Chrome/Edge 可用、profile 目录未被占用，详见统一日志。"
+        )
+        return 1
+    if end_reason == "page_error":
+        print(
+            "ERROR:WAIT_LOGIN_PAGE_ERROR 打开登录页或轮询过程异常，请查看上方 stderr 与统一日志。"
+        )
+        return 1
+    if end_reason == "config_error":
+        print("ERROR:WAIT_LOGIN_CONFIG_ERROR 登录子进程配置异常。")
+        return 1
+    if end_reason == "child_crash":
+        print("ERROR:WAIT_LOGIN_CHILD_CRASH 登录检测子进程异常退出且未写入有效结果。")
+        return 1
+    if end_reason == "profile_dir_unusable":
+        print(
+            "ERROR:WAIT_LOGIN_PROFILE_DIR 用户数据目录不可用或无法访问（权限/路径等），详见统一日志中的 login_child_result_detail / stderr。"
+        )
+        return 1
+    if end_reason == "logging_import_failed":
+        print(
+            "ERROR:WAIT_LOGIN_INTERNAL 登录子进程无法加载日志模块，请检查 account-manager 安装是否完整。"
+        )
+        return 1
+    if end_reason == "child_fatal":
+        print(
+            "ERROR:WAIT_LOGIN_CHILD_FATAL 登录子进程异常，详见统一日志 login_child_result_detail 或 login_child_stderr。"
+        )
+        return 1
     print(f"ERROR:WAIT_LOGIN_FAILED end_reason={end_reason}")
     return 1
 
@@ -386,7 +479,7 @@ def cmd_open(account_id):
     print(f"正在打开 [{target['name']}] 的 {browser_name}（仅查看，不写入数据库）")
     print(f"地址：{url}")
     print("请在本窗口中自行确认登录态。关闭浏览器后命令结束。")
-    print("需要自动检测并写入数据库时，请执行：python main.py login <id>")
+    print("需要自动检测登录时，请执行：python main.py login <id>")
 
     open_runner_path = os.path.join(_SERVICE_DIR, "open_child_runner.py")
     cfg = {"channel": channel, "profile_dir": profile_dir, "url": url}